diff --git a/.gitmodules b/.gitmodules
index fcb5bf9c8e6686ae08d6655cdeb32c28f21503cb..26ff2ad741514f09eb35dab11e4a5e1516fc02fd 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -25,8 +25,8 @@
 [submodule "plugins/TasksTimetable"]
 	path = plugins/TasksTimetable
 	url = https://github.com/piwik/plugin-TasksTimetable.git
-        branch = master
+    branch = master
 [submodule "plugins/LoginHttpAuth"]
 	path = plugins/LoginHttpAuth
 	url = https://github.com/piwik/plugin-LoginHttpAuth.git
-        branch = master
+    branch = master
diff --git a/core/AssetManager/UIAssetFetcher/JScriptUIAssetFetcher.php b/core/AssetManager/UIAssetFetcher/JScriptUIAssetFetcher.php
index 862b253e035bbf0d267e07e3c04c90c8ffd19d3f..9cb986b3481aac29aa2fd864b9198314ecf627ef 100644
--- a/core/AssetManager/UIAssetFetcher/JScriptUIAssetFetcher.php
+++ b/core/AssetManager/UIAssetFetcher/JScriptUIAssetFetcher.php
@@ -76,7 +76,7 @@ class JScriptUIAssetFetcher extends UIAssetFetcher
             'plugins/CoreHome/javascripts/require.js',
             'plugins/Zeitgeist/javascripts/piwikHelper.js',
             'plugins/Zeitgeist/javascripts/',
-            'plugins/CoreHome/javascripts/uIControl.js',
+            'plugins/CoreHome/javascripts/uiControl.js',
             'plugins/CoreHome/javascripts/broadcast.js',
             'plugins/',
             'tests/',
diff --git a/core/CliMulti/RequestCommand.php b/core/CliMulti/RequestCommand.php
index 8a1df0db1901658e6d73f18738fa998b4e0ff5d5..f6ccfd34549f3ecac506fdaa5f392c6c2c29b2ca 100644
--- a/core/CliMulti/RequestCommand.php
+++ b/core/CliMulti/RequestCommand.php
@@ -52,8 +52,6 @@ class RequestCommand extends ConsoleCommand
             $process->startProcess();
         }
 
-        Common::$isCliMode = false;
-
         require_once PIWIK_INCLUDE_PATH . $indexFile;
 
         if (!empty($process)) {
diff --git a/core/Common.php b/core/Common.php
index 670c25174f768f4fa9e4e494c2a64f217368b323..858c9fce288c274654624cb8697dbc9e8a1d254c 100644
--- a/core/Common.php
+++ b/core/Common.php
@@ -128,6 +128,18 @@ class Common
         (!strncmp(PHP_SAPI, 'cgi', 3) && empty($remoteAddr));
     }
 
+    /**
+     * Returns true if the current request is a console command, eg. ./console xx:yy
+     * @return bool
+     */
+    public static function isRunningConsoleCommand()
+    {
+        $searched = '/console';
+        $consolePos = strpos($_SERVER['SCRIPT_NAME'], $searched);
+        $expectedConsolePos = strlen($_SERVER['SCRIPT_NAME']) - strlen($searched);
+        $isScriptIsConsole = $consolePos == $expectedConsolePos;
+        return self::isPhpCliMode() && $isScriptIsConsole;
+    }
 
     /*
      * String operations
diff --git a/core/Console.php b/core/Console.php
index 086cbaf2c7b846b3bd00f3c38394d90948db47b1..638a810e46f2711b4359a6f71c9f3a35a44bad1d 100644
--- a/core/Console.php
+++ b/core/Console.php
@@ -61,7 +61,7 @@ class Console
      */
     private function getAvailableCommands()
     {
-        $commands = array('Piwik\CliMulti\RequestCommand');
+        $commands = $this->getDefaultCommands();
 
         /**
          * Triggered to gather all available console commands. Plugins that want to expose new console commands
@@ -96,7 +96,6 @@ class Console
             return $config;
         } catch (\Exception $e) {
             echo ($e->getMessage() . "\n\n");
-            exit(1);
         }
     }
 
@@ -106,4 +105,17 @@ class Console
         $pluginsManager = Plugin\Manager::getInstance();
         $pluginsManager->loadPlugins($pluginsToLoad);
     }
+
+    private function getDefaultCommands()
+    {
+        $commands = array(
+            'Piwik\CliMulti\RequestCommand'
+        );
+
+        if (class_exists('Piwik\Plugins\CloudAdmin\CloudAdmin')) {
+            $extra = new \Piwik\Plugins\CloudAdmin\CloudAdmin();
+            $extra->addConsoleCommands($commands);
+        }
+        return $commands;
+    }
 }
diff --git a/core/CronArchive.php b/core/CronArchive.php
index bf1a7b0b4b1a8c2084208f628a6a61c69df9d10c..40866d29832aa10dfadbd60289b0c6831b7fd85f 100644
--- a/core/CronArchive.php
+++ b/core/CronArchive.php
@@ -34,7 +34,7 @@ Arguments:
 	--force-all-periods[=seconds]
 			Limits archiving to websites with some traffic in the last [seconds] seconds.
 			For example --force-all-periods=86400 will archive websites that had visits in the last 24 hours.
-			If [seconds] is not specified, all websites will visits in the last ". CronArchive::ARCHIVE_SITES_WITH_TRAFFIC_SINCE
+			If [seconds] is not specified, all websites with visits in the last ". CronArchive::ARCHIVE_SITES_WITH_TRAFFIC_SINCE
             . " seconds (" . round( CronArchive::ARCHIVE_SITES_WITH_TRAFFIC_SINCE/86400 ) ." days) will be archived.
 	--force-timeout-for-periods=[seconds]
 			The current week/ current month/ current year will be processed at most every [seconds].
@@ -680,7 +680,7 @@ Notes:
         $config = Config::getInstance();
         $config->log['log_only_when_debug_parameter'] = 0;
         $config->log[\Piwik\Log::LOG_WRITERS_CONFIG_OPTION] = array("screen");
-        $config->log[\Piwik\Log::LOG_LEVEL_CONFIG_OPTION] = 'VERBOSE';
+        $config->log[\Piwik\Log::LOG_LEVEL_CONFIG_OPTION] = 'INFO';
 
         if (!function_exists("curl_multi_init")) {
             $this->log("ERROR: this script requires curl extension php_curl enabled in your CLI php.ini");
diff --git a/core/Filechecks.php b/core/Filechecks.php
index 56bf395acb03905ad53521aaeccac78fa8d94443..7a82db5b2be10952bdc537763a47422119d72ac2 100644
--- a/core/Filechecks.php
+++ b/core/Filechecks.php
@@ -43,7 +43,9 @@ class Filechecks
                 $directoryToCheck = PIWIK_USER_PATH . $directoryToCheck;
             }
 
-            $directoryToCheck = SettingsPiwik::rewriteTmpPathWithHostname($directoryToCheck);
+            if(strpos($directoryToCheck, '/tmp/') !== false) {
+                $directoryToCheck = SettingsPiwik::rewriteTmpPathWithHostname($directoryToCheck);
+            }
 
             Filesystem::mkdir($directoryToCheck);
 
diff --git a/core/Plugin/Manager.php b/core/Plugin/Manager.php
index 87eb628eb8eaa9a0fc79eced30fec51a23b18d96..2e5e0c63f6cc89723266cdcec555fa02f09697e3 100644
--- a/core/Plugin/Manager.php
+++ b/core/Plugin/Manager.php
@@ -16,9 +16,9 @@ use Piwik\Filesystem;
 use Piwik\Option;
 use Piwik\Plugin;
 use Piwik\Singleton;
+use Piwik\Theme;
 use Piwik\Translate;
 use Piwik\Updater;
-use Piwik\Theme;
 
 require_once PIWIK_INCLUDE_PATH . '/core/EventDispatcher.php';
 
@@ -72,60 +72,22 @@ class Manager extends Singleton
         'LeftMenu'
     );
 
-    public static $pluginsToLoadForTests = array(
-        "CorePluginsAdmin",
-        "CoreAdminHome",
-        "CoreHome",
-        "Proxy",
-        "API",
-        "Widgetize",
-        "Transitions",
-        "LanguagesManager",
-        "Actions",
-        "Dashboard",
-        "MultiSites",
-        "Referrers",
-        "UserSettings",
-        "Goals",
-        "SEO",
-        "UserCountry",
-        "VisitsSummary",
-        "VisitFrequency",
-        "VisitTime",
-        "VisitorInterest",
-        "ExampleAPI",
-        "ExamplePlugin",
-        "ExampleRssWidget",
-        "Provider",
-        "Feedback",
-        "Login",
-        "UsersManager",
-        "SitesManager",
-        "Installation",
-        "CoreUpdater",
-        "ScheduledReports",
-        "UserCountryMap",
-        "Live",
-        "CustomVariables",
-        "PrivacyManager",
-        "ImageGraph",
-        "Annotations",
-        "MobileMessaging",
-        "Overlay",
-        "SegmentEditor",
-        "DevicesDetection",
-        "DBStats",
-        'ExampleUI',
-        "TasksTimetable",
-        "Morpheus",
-        "Zeitgeist",
-        "CustomAlerts",
-        "VisitorGenerator",
-        "SecurityInfo",
-        "ExampleSettingsPlugin",
-        "TreemapVisualization",
-        "Events"
-    );
+    public function getPluginsToLoadDuringTests()
+    {
+        $toLoad = array();
+        foreach($this->readPluginsDirectory() as $plugin) {
+            $isPluginBundledWithCore = $this->isPluginBundledWithCore($plugin);
+            $isPluginOfficiallySupported = $this->isPluginOfficialAndNotBundledWithCore($plugin);
+
+            // Do not enable other Login plugins
+            $isPluginOfficiallySupported = $isPluginOfficiallySupported && strpos($plugin, 'Login') === false;
+
+            if($isPluginBundledWithCore || $isPluginOfficiallySupported) {
+                $toLoad[] = $plugin;
+            }
+        }
+        return $toLoad;
+    }
 
     public function getCorePluginsDisabledByDefault()
     {
@@ -135,6 +97,19 @@ class Manager extends Singleton
     // If a plugin hooks onto at least an event starting with "Tracker.", we load the plugin during tracker
     const TRACKER_EVENT_PREFIX = 'Tracker.';
 
+    /**
+     * @param $pluginName
+     * @return bool
+     */
+    public function isPluginOfficialAndNotBundledWithCore($pluginName)
+    {
+        static $gitModules;
+        if(empty($gitModules)) {
+            $gitModules = file_get_contents(PIWIK_INCLUDE_PATH . '/.gitmodules');
+        }
+        return false !== strpos($gitModules, "plugins/" . $pluginName);
+    }
+
     /**
      * Update Plugins config
      *
@@ -340,6 +315,7 @@ class Manager extends Singleton
         }
 
         if (!$this->isPluginInFilesystem($pluginName)) {
+            throw new \Exception("Plugin '$pluginName' cannot be found in the filesystem in plugins/ directory.");
             return;
         }
         $this->deactivateThemeIfTheme($pluginName);
@@ -347,6 +323,7 @@ class Manager extends Singleton
         // Load plugin
         $plugin = $this->loadPlugin($pluginName);
         if ($plugin === null) {
+            throw new \Exception("The plugin '$pluginName' was found in the filesystem, but could not be loaded.'");
             return;
         }
         $this->installPluginIfNecessary($plugin);
diff --git a/core/Session.php b/core/Session.php
index d4f14dc26f39d32bd41b0fed2c4f3366b09463ef..7109dd0db2f56a81f17af5e670b734050437a272 100644
--- a/core/Session.php
+++ b/core/Session.php
@@ -39,7 +39,7 @@ class Session extends Zend_Session
      */
     public static function start($options = false)
     {
-        if (Common::isPhpCliMode()
+        if (headers_sent()
             || self::$sessionStarted
             || (defined('PIWIK_ENABLE_SESSION_START') && !PIWIK_ENABLE_SESSION_START)
         ) {
diff --git a/core/Updater.php b/core/Updater.php
index f63131aeb1a2764c0fb37b845d65c1990a21312e..59587cb19b883d22e38ea2c13751e0388e035380 100644
--- a/core/Updater.php
+++ b/core/Updater.php
@@ -126,9 +126,9 @@ class Updater
                 $this->hasMajorDbUpdate = $this->hasMajorDbUpdate || call_user_func(array($className, 'isMajorUpdate'));
             }
             // unfortunately had to extract this query from the Option class
-            $queries[] = 'UPDATE `' . Common::prefixTable('option') . '`
-    				SET option_value = \'' . $fileVersion . '\'
-    				WHERE option_name = \'' . self::getNameInOptionTable($componentName) . '\';';
+            $queries[] = 'UPDATE `' . Common::prefixTable('option') . '` '.
+    				'SET option_value = \'' . $fileVersion . '\' '.
+    				'WHERE option_name = \'' . self::getNameInOptionTable($componentName) . '\';';
         }
         return $queries;
     }
diff --git a/core/Updates/2.0.4-b5.php b/core/Updates/2.0.4-b5.php
index b4cb21fc1ecf6bd181927b890812b6a99cfde5f0..78c8ab2b542b550d3088d4d604a50eb13a71008c 100644
--- a/core/Updates/2.0.4-b5.php
+++ b/core/Updates/2.0.4-b5.php
@@ -64,16 +64,20 @@ class Updates_2_0_4_b5 extends Updates
 
         $userApi = UsersManagerApi::getInstance();
 
-        Db::get()->insert(Common::prefixTable('user'), array(
-                'login'      => $superUser['login'],
-                'password'   => $superUser['password'],
-                'alias'      => $superUser['login'],
-                'email'      => $superUser['email'],
-                'token_auth' => $userApi->getTokenAuth($superUser['login'], $superUser['password']),
-                'date_registered'  => Date::now()->getDatetime(),
-                'superuser_access' => 1
-            )
-        );
+        try {
+            Db::get()->insert(Common::prefixTable('user'), array(
+                    'login'      => $superUser['login'],
+                    'password'   => $superUser['password'],
+                    'alias'      => $superUser['login'],
+                    'email'      => $superUser['email'],
+                    'token_auth' => $userApi->getTokenAuth($superUser['login'], $superUser['password']),
+                    'date_registered'  => Date::now()->getDatetime(),
+                    'superuser_access' => 1
+                )
+            );
+        } catch(\Exception $e) {
+            echo "There was an issue, but we proceed: " . $e->getMessage();
+        }
 
         if (array_key_exists('salt', $superUser)) {
             $salt = $superUser['salt'];
diff --git a/core/Url.php b/core/Url.php
index c023228fac3fbeca670957155811aaf4ee5c7a21..26e4249ec3e0d05e37acf4dd196a50e280acec52 100644
--- a/core/Url.php
+++ b/core/Url.php
@@ -469,6 +469,10 @@ class Url
         } else {
             echo "Invalid URL to redirect to.";
         }
+
+        if(Common::isPhpCliMode()) {
+            die("If you were using a browser, Piwik would redirect you to this URL: $url \n\n");
+        }
         exit;
     }
 
diff --git a/core/Version.php b/core/Version.php
index 423684559db28429f556d01c21aa58f9eac5a7d0..f49ce4f5d47b3ece52d0f74a843ca0b857d506e7 100644
--- a/core/Version.php
+++ b/core/Version.php
@@ -21,5 +21,5 @@ final class Version
      * The current Piwik version.
      * @var string
      */
-    const VERSION = '2.1-rc4';
+    const VERSION = '2.1-rc7';
 }
diff --git a/lang/bg.json b/lang/bg.json
index 67ad7e2e6d981dd4196b2687376cd7dec3ffaee4..2d9c2dba63a2cfdcf3b50c58287d07b17919082a 100644
--- a/lang/bg.json
+++ b/lang/bg.json
@@ -75,6 +75,7 @@
         "HideAnnotationsFor": "Скриване на анотациите за %s...",
         "IconDesc": "Вижте бележките за този период от време.",
         "IconDescHideNotes": "Скриване на бележките за този период от време.",
+        "InlineQuickHelp": "Можете да създавате анотации, за да отбелязвате специални събития (като нова публикация в блог или нов изглед на сайт), за съхраняване на анализи или за запазване на нещо друго, което смятате за важно.",
         "LoginToAnnotate": "Влезте в профила си за да създадете анотация.",
         "NoAnnotations": "Няма анотации за този период от време.",
         "PluginDescription": "Позволява да се прикрепят бележки към различни дни, за да бъдат отбелязани промените, направени във вашия сайт. Запазва анализите в зависимост от информацията, която е предоставена и споделя мнението ви с вашите колеги. Публикувайки данните ще имате възможност да запомните по какъв начин изглеждат те.",
@@ -115,6 +116,7 @@
         "JSTracking_CustomCampaignQueryParam": "Използвайте произволно име на параметър заявка за име и ключ на кампанията",
         "JSTracking_CustomCampaignQueryParamDesc": "Забележка: %1$sPiwik автоматично ще засече Google Analytics параметрите.%2$s",
         "JSTracking_EnableDoNotTrack": "Активиране на режим за засичане на включена функция „Не проследявай“",
+        "JSTracking_EnableDoNotTrack_AlreadyEnabled": "Забележка: От страна на сървъра е включена настройката „Не проследявай“, така че тази настройка няма да окаже ефект.",
         "JSTracking_EnableDoNotTrackDesc": "Заявките за следене няма да бъдат изпратени, ако посетителите не желаят да бъде събирана информация за тях.",
         "JSTracking_GroupPageTitlesByDomainDesc1": "В случай, че някой посети страница „За“ в блога, %1$s ще бъде записан\/о в 'Блог \/ За'. Това е най-лесният начин, за да се направи преглед на трафика по поддомейн.",
         "JSTracking_MergeAliases": "В доклада за „Изходните страници“ скрийте щракванията до познати адреси на",
@@ -199,6 +201,7 @@
         "PluginDescription": "Уеб Анализи Доклади структура.",
         "ReportGeneratedOn": "Доклада е генериран за %s",
         "ReportGeneratedXAgo": "Доклада е генериран преди %s",
+        "SharePiwikLong": "Здравейте! Туко-що открих прекрасен софтуер с отворен код: Piwik! Piwik позволява проследяването на посетителите на даден сайт безплатно. Задължително трябва да го пробвате!",
         "SharePiwikShort": "Piwik! Софтуер с отворен код за уеб анализ. Притежавайте вашите собствени данни.",
         "ShareThis": "Сподели това",
         "ShowJSCode": "Покажи JavaScript кода за вмъкване в сайта",
@@ -379,6 +382,7 @@
         "CopyDashboardToUser": "Копиране на табло при потребител",
         "CreateNewDashboard": "Направете ново табло",
         "Dashboard": "Табло",
+        "DashboardCopied": "Настоящото табло е успешно копирано при избрания потребител.",
         "DashboardEmptyNotification": "Вашето табло не съдържа никакви джаджи. Започнете с добавяне на някои джаджи или просто нулирайте таблото, за да изберете джаджите по подразбиране.",
         "DashboardName": "Име на табло:",
         "DashboardOf": "Табло за %s",
@@ -588,6 +592,7 @@
         "ErrorRequest": "Ооопс… възникна грешка! Опитайте отново.",
         "EvolutionOverPeriod": "Развитие за периода",
         "EvolutionSummaryGeneric": "%1$s в %2$s сравнено с %3$s в %4$s. Нарастване: %5$s",
+        "ExceptionCheckUserHasSuperUserAccessOrIsTheUser": "Потребителят трябва да бъде или привилигирован потребител или потребител '%s'.",
         "ExceptionConfigurationFileNotFound": "Конфигурационния файл {%s} не бе намерен.",
         "ExceptionDatabaseVersion": "Вашата %1$s версия е %2$s ,но Piwik изисква най-малко %3$s.",
         "ExceptionFileIntegrity": "Цялостната проверка неуспешна: %s",
@@ -1256,6 +1261,7 @@
     },
     "Overlay": {
         "Clicks": "%s клика",
+        "ClicksFromXLinks": "%1$s щраквания от една от %2$s връзките",
         "Domain": "Домейн",
         "ErrorNotLoadingDetails": "Възможно е заредената страница вдясно да няма последяващия Piwik код. В този случай опитайте да стартирате нова връзка за различна страница от доклада на страници.",
         "ErrorNotLoadingLink": "Щраквайки тук, ще получите повече съвети за отстраняване на проблеми",
@@ -1354,8 +1360,10 @@
         "Keywords": "Ключови думи",
         "KeywordsReportDocumentation": "Този отчет показва кои ключови думи потребителите са използвали преди да бъдат препратени към вашият уеб сайт. %s Ако кликнете върху реда в таблицата, можете да видите разпределението на търсачките, в които са били търсени тези ключови думи.",
         "PluginDescription": "Докладът на референтите данни: търсачки, ключови думи, уеб сайтове, кампания за проследяване, директен запис.",
+        "Referrer": "Препоръчител",
         "ReferrerName": "Име на референт",
         "Referrers": "Референции",
+        "ReferrersOverview": "Преглед на препоръчителите",
         "SearchEngines": "Търсачки",
         "SearchEnginesDocumentation": "Посетител, който е бил препратен към вашият уеб сайт от търсачка. %s Погледнете %s отчета за повече детайли.",
         "SearchEnginesReportDocumentation": "Този отчет показва кои търсачки са изпратили потребители към вашият уеб сайт. %s Ако кликнете върху реда в таблицата, можете да видите какво потребителите са търсили в конкретната търсачка.",
@@ -1369,13 +1377,17 @@
         "TypeSearchEngines": "%s от търсещите машини",
         "TypeWebsites": "%s от сайтове",
         "UsingNDistinctUrls": "(използват се %s различни адреса)",
+        "ViewAllReferrers": "Преглед на всички препоръчители",
+        "ViewReferrersBy": "Преглед на всички препоръчители по %s",
         "Websites": "Сайтове",
         "WebsitesDocumentation": "Посетителят е последвал връзка в друг сайт, която сочи към вашия сайт. %s Вижте %s отчета за повече детайли.",
         "WebsitesReportDocumentation": "В тази таблица, можете да видите кои уеб сайтове са препратили посетители към вашият сайт. %s Ако кликнете върху реда в таблицата, можете да видите URL-ите, чрез които потребителите са стигнали до вашият сайт.",
         "WidgetExternalWebsites": "Външни сайтове",
+        "WidgetGetAll": "Всички препоръчители",
         "WidgetKeywords": "Популярни ключови думи",
         "WidgetSocials": "Списък на социалните мрежи",
-        "WidgetTopKeywordsForPages": "Най-използваните ключови думи"
+        "WidgetTopKeywordsForPages": "Най-използваните ключови думи",
+        "XPercentOfVisits": "%s%% от посещения"
     },
     "RowEvolution": {
         "AvailableMetrics": "Налични метрики",
@@ -1383,6 +1395,7 @@
         "ComparingRecords": "Сравнявайки %s редове",
         "MetricBetweenText": "между %s и %s",
         "MetricChangeText": "%s промени през периода",
+        "MetricMinMax": "%1$s варират между %2$s и %3$s за периода",
         "MetricsFor": "Метрики за %s",
         "PickAnotherRow": "Изберете друг ред за сравнение",
         "PickARow": "Изберете ред за сравнение"
@@ -1397,6 +1410,7 @@
         "CancelAndReturnToReports": "Откажи и се %s върни в списъка с отчети %s",
         "CreateAndScheduleReport": "Създайте доклад и разписание",
         "CreateReport": "Създайте доклад",
+        "CustomVisitorSegment": "Персонализиран посетителски сегмент:",
         "DescriptionOnFirstPage": "Описанието на този отчет ще бъде показано на първата страница на отчета.",
         "DisplayFormat_TablesOnly": "Покажете само таблици (без графики)",
         "EmailHello": "Здравей,",
diff --git a/lang/et.json b/lang/et.json
index 1b64fbf935f446850ce3eb2f5f73c509f50ea4e0..2f10a050574e35163ca874053f721e4721a473fe 100644
--- a/lang/et.json
+++ b/lang/et.json
@@ -60,7 +60,9 @@
     },
     "API": {
         "LoadedAPIs": "Edukalt laetud %s API-id",
-        "QuickDocumentationTitle": "API kiire dokumentatsioon",
+        "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"
     },
     "CoreAdminHome": {
@@ -111,7 +113,7 @@
         "LongWeekFormat": "%dayFrom%.%longMonthFrom% - %dayTo%.%longMonthTo% %longYearTo%",
         "MakeADifference": "Aita kaasa: %1$sAnneta%2$s Piwik 2.0 arendamiseks!",
         "MakeOneTimeDonation": "Või tee hoopis ühekordne annetus.",
-        "PageOf": "%1$s - %2$s",
+        "PageOf": "%1$s \/ %2$s",
         "PeriodDay": "Päev",
         "PeriodDays": "päeva",
         "PeriodMonth": "Kuu",
@@ -548,6 +550,7 @@
         "Piechart": "Sektordiagramm",
         "PiwikIsACollaborativeProjectYouCanContributeAndDonate": "%1$s Piwik %2$s on koostööprojekt. %3$s Kui sa oled Piwiku fänn, siis saad abiks olla: vaata %4$s Kuidas Piwiku arenduses kaasa lüüa%5$s, või%6$s %7$sanneta kohe%8$s et aidata Piwiku arengut rahastada!",
         "PiwikXIsAvailablePleaseNotifyPiwikAdmin": "%s on saadaval. Palun teavita lehe haldajat.",
+        "PiwikXIsAvailablePleaseUpdateNow": "Piwik %1$s on saadaval. %2$sPalun uuenda kohe!%3$s (vaata %4$smuudatusi%5$s).",
         "PleaseSpecifyValue": "Palun täpsusta '%s' väärtust.",
         "PleaseUpdatePiwik": "Palun uuenda oma Piwikut",
         "Plugin": "Lisatarkvara",
@@ -733,7 +736,8 @@
         "VisitsUntilConv": "Külastusi tulu tekitamiseni",
         "VisitUrl": "Külastavad määratud URLi (leht või lehtede grupp)",
         "WhenVisitors": "kui külastajad",
-        "WhereThe": "kus"
+        "WhereThe": "kus",
+        "YouCanEnableEcommerceReports": "Sa saad aktiveerida %s antud veebilehele %s lehel."
     },
     "Installation": {
         "CollaborativeProject": "Piwik on koostööprojekt, mis on valminud armastusega inimeste poolt üle kogu maailma.",
@@ -1031,7 +1035,12 @@
         "PickARow": "Vali rida, millega võrrelda"
     },
     "ScheduledReports": {
-        "AggregateReportsFormat": "(valikuline) Kuvamise valikud",
+        "AggregateReportsFormat": "(valikuline) Kuvamise seaded",
+        "AggregateReportsFormat_GraphsOnly": "Kuva ainult graafikud (tabelid puuduvad)",
+        "AggregateReportsFormat_TablesAndGraphs": "Kuva tabelid ja graafikud kõikidele raportitele",
+        "AggregateReportsFormat_TablesOnly": "(vaikimisi) Kuva raportite tabelid (ja olulistele mõõdikutele ka graafikud)",
+        "AlsoSendReportToTheseEmails": "Saada raport ka järgnevatele e-posti aadressitele (iga aadress eraldi real):",
+        "CancelAndReturnToReports": "Katkesta ja %snaase raportite nimekirja%s",
         "CreateAndScheduleReport": "Loo ja ajasta raporti käivitumine",
         "CreateReport": "Loo raport",
         "CustomVisitorSegment": "Kohandatud külastaja segment:",
@@ -1046,6 +1055,7 @@
         "PleaseFindAttachedFile": "Manusest leiad oma %1$s raporti %2$s jaoks.",
         "ReportFormat": "Raporti formaat",
         "ReportHour": "Raporti saatmise aeg",
+        "ReportIncludeNWebsites": "Antud raport sisaldab põhimõõdikuid kõikide veebilehtede kohta, millel on vähemalt üks külastus (%s veebilehest, mis on kokku saadaval).",
         "ReportSent": "Raport saadetud",
         "ReportsIncluded": "Statistika osade kaasamine",
         "ReportType": "Raporti saatmise kanal",
diff --git a/lang/hr.json b/lang/hr.json
index 314afd501a6581d54e3978ac091da24ab12361b3..316ad2b5c099b53dde3937eefdd7ae72243013ee 100644
--- a/lang/hr.json
+++ b/lang/hr.json
@@ -45,6 +45,7 @@
         "SubmenuPagesExit": "Izlazne stranice",
         "SubmenuPageTitles": "Naslovi stranica",
         "SubmenuSitesearch": "Pretraga stranice",
+        "WidgetEntryPageTitles": "Naslovi ulaznih stranica",
         "WidgetExitPageTitles": "Izlazni naslovi stranica",
         "WidgetPagesEntry": "Ulazne stranice",
         "WidgetPagesExit": "Izlazne stranice",
@@ -55,7 +56,11 @@
     "Annotations": {
         "AddAnnotationsFor": "Dodaj bilješke za %s...",
         "AnnotationOnDate": "Interaktivne bilješke na %1$s: %2$s",
-        "Annotations": "Interaktivne bilješke"
+        "Annotations": "Interaktivne bilješke",
+        "ClickToDelete": "Kliknite izbrisati ovu obavijest.",
+        "ClickToEdit": "Klikni za urediti ovu obavijest.",
+        "EnterAnnotationText": "Unesi svoju bilješku",
+        "LoginToAnnotate": "Prijavi se za objaviti obavijest."
     },
     "CoreAdminHome": {
         "Administration": "Administracija",
@@ -79,7 +84,21 @@
         "ActionInstall": "Instaliraj"
     },
     "Dashboard": {
-        "Dashboard": "Upravljačka ploča"
+        "AddAWidget": "Dodaj novi widget",
+        "AddPreviewedWidget": "Klikni za dodati widget na kontrolnu ploču",
+        "Dashboard": "Kontrolna ploča",
+        "DashboardName": "Naziv kontrolne ploče:",
+        "DashboardOf": "Kontrolna ploča %s",
+        "LoadingWidget": "Učitavanje widgeta, molimo pričekajte...",
+        "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",
+        "WidgetPreview": "Predpregled widgeta",
+        "WidgetsAndDashboard": "Wigeti i kontrolna ploča"
     },
     "General": {
         "AbandonedCarts": "Napuštene košarice",
@@ -275,6 +294,7 @@
         "Others": "Ostali",
         "Outlinks": "Odlazni linkovi",
         "Overview": "Pregled",
+        "Pages": "Stranice",
         "Period": "Razdoblje",
         "Piechart": "Pita",
         "PiwikXIsAvailablePleaseNotifyPiwikAdmin": "Dostupan je %s. Molimo vas da obavijestite administratora stranice.",
@@ -376,7 +396,17 @@
         "YourChangesHaveBeenSaved": "Tvoje su izmjene spremljene"
     },
     "Live": {
-        "VisitorLog": "Zapis posjetitelja"
+        "GoalType": "Vrsta",
+        "HideMap": "sakrij mapu",
+        "LoadMoreVisits": "Učitaj više posjeta",
+        "NbVisitor": "1 visitor",
+        "NextVisitor": "Slijedeći posjetitelj",
+        "PreviousVisitor": "Prijašnji posjetitelj",
+        "Referrer_URL": "Referrer URL",
+        "ShowMap": "pokaži mapu",
+        "VisitedPages": "Posjećene stranice",
+        "VisitorLog": "Zapis posjeta",
+        "VisitorsInRealTime": "Posjete u stvarnom vremenu"
     },
     "Mobile": {
         "SaveSuccessError": "Molim provjerite postavke"
@@ -654,6 +684,9 @@
         "Location": "Lokacija",
         "SubmenuLocations": "Lokacije"
     },
+    "UserCountryMap": {
+        "VisitorMap": "Mapa posjetitelja"
+    },
     "UserSettings": {
         "Browsers": "Pretraživači",
         "ColumnBrowserVersion": "Verzija pretraživača",
@@ -845,7 +878,8 @@
         "Language_za": "zhuang",
         "Language_zh": "kineski",
         "Language_zu": "zulu",
-        "VisitorSettings": "Postavke posjetitelja"
+        "VisitorSettings": "Postavke posjetitelja",
+        "WidgetBrowsers": "Pretraživać posjetitelja"
     },
     "UsersManager": {
         "ExceptionEmailExists": "Korisnik sa istim emailom '%s' već postoji.",
@@ -856,6 +890,17 @@
         "TypeYourPasswordAgain": "Ponovi novu lozinku.",
         "YourUsernameCannotBeChanged": "Korisničko ime se ne može promijeniti"
     },
+    "VisitsSummary": {
+        "VisitsSummary": "Pregled posjeta",
+        "WidgetLastVisits": "Posjete kroz vrijeme",
+        "WidgetOverviewGraph": "Pregled posjeta (sa grafom)",
+        "WidgetVisits": "Pregled posjeta"
+    },
+    "VisitTime": {
+        "ColumnServerTime": "Vrijeme servera",
+        "LocalTime": "Posjete po lokalnom vremenu",
+        "WidgetServerTime": "Posjete po vremenu servera"
+    },
     "Widgetize": {
         "OpenInNewWindow": "Otvori u novom prozoru"
     }
diff --git a/lang/ro.json b/lang/ro.json
index 9a12f77e179f388096d3b186b8565b8ce42a8a51..75ec56ffbc2fc66b6e92af193176bb54dc3f99c9 100644
--- a/lang/ro.json
+++ b/lang/ro.json
@@ -1475,6 +1475,7 @@
         "BetweenXYSeconds": "%1$s-%2$ssec.",
         "ColumnPagesPerVisit": "Pagini pentru o vizită",
         "ColumnVisitDuration": "Durata vizitei",
+        "Engagement": "Vizite repetate",
         "NPages": "%s pagini",
         "OneMinute": "1 min",
         "OnePage": "1 pagina",
diff --git a/lang/sv.json b/lang/sv.json
index 087d0bc76ad0dae25a4046ab5aeb287a9085ca4e..348053770a12ff61da0b72b42221104666625846 100644
--- a/lang/sv.json
+++ b/lang/sv.json
@@ -230,6 +230,7 @@
         "MenuPlatform": "Plattform",
         "NoPluginsFound": "Inga plugin hittade",
         "NoThemesFound": "Inga teman kunde hittas",
+        "Origin": "Ursprung",
         "OriginThirdParty": "Tredje-part",
         "PluginDescription": "administrationsgränssnitt för plugins.",
         "PluginHomepage": "Plugin Hemsida",
diff --git a/misc/others/crossdomain.xml b/misc/others/crossdomain.xml
deleted file mode 100644
index d9d29cc4f2628f9f8790bbeb001e41fc51e905b8..0000000000000000000000000000000000000000
--- a/misc/others/crossdomain.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE cross-domain-policy SYSTEM "http://www.macromedia.com/xml/dtds/cross-domain-policy.dtd">
-<cross-domain-policy>
-	<allow-access-from domain="*.piwik.org" />
-</cross-domain-policy>
diff --git a/misc/others/db-schema-README b/misc/others/db-schema-README
deleted file mode 100644
index 965b89afb03d949f2b3b9f91f226ec6d262f969f..0000000000000000000000000000000000000000
--- a/misc/others/db-schema-README
+++ /dev/null
@@ -1,14 +0,0 @@
-Schema edited with DBDESIGNER
-=============================
-
---> Official documentation on http://dev.piwik.org/trac/wiki/DatabaseSchema <--
-
-
-DBdesigner is a great tool for designing Database schema, generating the SQL associated, 
-and editing beautiful database schema images so that you're proud and happy to show your
- design to your fellow developer friends.
-
-  How to install DBDesigner on Linux
-  http://noteplog.com/how-to-install-dbdesigner-on-linux/
-  
-  Also available for windows
diff --git a/misc/others/db-schema.png b/misc/others/db-schema.png
deleted file mode 100644
index 709a5b16804a31407625a14b57a87a563ebf786b..0000000000000000000000000000000000000000
Binary files a/misc/others/db-schema.png and /dev/null differ
diff --git a/misc/others/db-schema.xml b/misc/others/db-schema.xml
deleted file mode 100644
index e99c25891c1090ac0911d895d9c5ad49281bb530..0000000000000000000000000000000000000000
--- a/misc/others/db-schema.xml
+++ /dev/null
@@ -1,1612 +0,0 @@
-<?xml version="1.0" standalone="yes" ?>
-<DBMODEL Version="4.0">
-	<SETTINGS>
-		<GLOBALSETTINGS ModelName="db-schema" IDModel="0" IDVersion="0"
-			VersionStr="1.0.0.0" Comments="" UseVersionHistroy="1"
-			AutoIncVersion="1" DatabaseType="MySQL" ZoomFac="80.00" XPos="0"
-			YPos="0" DefaultDataType="5" DefaultTablePrefix="0" DefSaveDBConn=""
-			DefSyncDBConn="" DefQueryDBConn="" Printer="" HPageCount="4.0"
-			PageAspectRatio="1.440892512336408" PageOrientation="1"
-			PageFormat="A4 (210x297 mm, 8.26x11.7 inches)" SelectedPages=""
-			UsePositionGrid="0" PositionGridX="20" PositionGridY="20"
-			TableNameInRefs="0" DefaultTableType="0"
-			ActivateRefDefForNewRelations="1" FKPrefix="" FKPostfix=""
-			CreateFKRefDefIndex="0" DBQuoteCharacter="`"
-			CreateSQLforLinkedObjects="0" DefModelFont="Tahoma"
-			CanvasWidth="4096" CanvasHeight="2842" />
-		<DATATYPEGROUPS>
-			<DATATYPEGROUP Name="Numeric Types" Icon="1" />
-			<DATATYPEGROUP Name="Date and Time Types" Icon="2" />
-			<DATATYPEGROUP Name="String Types" Icon="3" />
-			<DATATYPEGROUP Name="Blob and Text Types" Icon="4" />
-			<DATATYPEGROUP Name="User defined Types" Icon="5" />
-			<DATATYPEGROUP Name="Geographic Types" Icon="6" />
-		</DATATYPEGROUPS>
-		<DATATYPES>
-			<DATATYPE ID="1" IDGroup="0" TypeName="TINYINT"
-				Description="A very small integer. The signed range is -128 to 127. The unsigned range is 0 to 255."
-				ParamCount="1" OptionCount="2" ParamRequired="0"
-				EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0"
-				PhysicalTypeName="">
-				<PARAMS>
-					<PARAM Name="length" />
-				</PARAMS>
-				<OPTIONS>
-					<OPTION Name="UNSIGNED" Default="1" />
-					<OPTION Name="ZEROFILL" Default="0" />
-				</OPTIONS>
-			</DATATYPE>
-			<DATATYPE ID="2" IDGroup="0" TypeName="SMALLINT"
-				Description="A small integer. The signed range is -32768 to 32767. The unsigned range is 0 to 65535."
-				ParamCount="1" OptionCount="2" ParamRequired="0"
-				EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0"
-				PhysicalTypeName="">
-				<PARAMS>
-					<PARAM Name="length" />
-				</PARAMS>
-				<OPTIONS>
-					<OPTION Name="UNSIGNED" Default="1" />
-					<OPTION Name="ZEROFILL" Default="0" />
-				</OPTIONS>
-			</DATATYPE>
-			<DATATYPE ID="3" IDGroup="0" TypeName="MEDIUMINT"
-				Description="A medium-size integer. The signed range is -8388608 to 8388607. The unsigned range is 0 to 16777215."
-				ParamCount="1" OptionCount="2" ParamRequired="0"
-				EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0"
-				PhysicalTypeName="">
-				<PARAMS>
-					<PARAM Name="length" />
-				</PARAMS>
-				<OPTIONS>
-					<OPTION Name="UNSIGNED" Default="1" />
-					<OPTION Name="ZEROFILL" Default="0" />
-				</OPTIONS>
-			</DATATYPE>
-			<DATATYPE ID="4" IDGroup="0" TypeName="INT"
-				Description="A normal-size integer. The signed range is -2147483648 to 2147483647. The unsigned range is 0 to 4294967295."
-				ParamCount="1" OptionCount="2" ParamRequired="0"
-				EditParamsAsString="0" SynonymGroup="1" PhysicalMapping="0"
-				PhysicalTypeName="">
-				<PARAMS>
-					<PARAM Name="length" />
-				</PARAMS>
-				<OPTIONS>
-					<OPTION Name="UNSIGNED" Default="0" />
-					<OPTION Name="ZEROFILL" Default="0" />
-				</OPTIONS>
-			</DATATYPE>
-			<DATATYPE ID="5" IDGroup="0" TypeName="INTEGER"
-				Description="A normal-size integer. The signed range is -2147483648 to 2147483647. The unsigned range is 0 to 4294967295."
-				ParamCount="1" OptionCount="2" ParamRequired="0"
-				EditParamsAsString="0" SynonymGroup="1" PhysicalMapping="0"
-				PhysicalTypeName="">
-				<PARAMS>
-					<PARAM Name="length" />
-				</PARAMS>
-				<OPTIONS>
-					<OPTION Name="UNSIGNED" Default="1" />
-					<OPTION Name="ZEROFILL" Default="0" />
-				</OPTIONS>
-			</DATATYPE>
-			<DATATYPE ID="6" IDGroup="0" TypeName="BIGINT"
-				Description="A large integer. The signed range is -9223372036854775808 to 9223372036854775807. The unsigned range is 0 to 18446744073709551615."
-				ParamCount="1" OptionCount="2" ParamRequired="0"
-				EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0"
-				PhysicalTypeName="">
-				<PARAMS>
-					<PARAM Name="length" />
-				</PARAMS>
-				<OPTIONS>
-					<OPTION Name="UNSIGNED" Default="0" />
-					<OPTION Name="ZEROFILL" Default="0" />
-				</OPTIONS>
-			</DATATYPE>
-			<DATATYPE ID="7" IDGroup="0" TypeName="FLOAT"
-				Description="A small (single-precision) floating-point number. Cannot be unsigned. Allowable values are -3.402823466E+38 to -1.175494351E-38, 0, and 1.175494351E-38 to 3.402823466E+38."
-				ParamCount="1" OptionCount="1" ParamRequired="1"
-				EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0"
-				PhysicalTypeName="">
-				<PARAMS>
-					<PARAM Name="precision" />
-				</PARAMS>
-				<OPTIONS>
-					<OPTION Name="ZEROFILL" Default="0" />
-				</OPTIONS>
-			</DATATYPE>
-			<DATATYPE ID="8" IDGroup="0" TypeName="FLOAT"
-				Description="A small (single-precision) floating-point number. Cannot be unsigned. Allowable values are -3.402823466E+38 to -1.175494351E-38, 0, and 1.175494351E-38 to 3.402823466E+38."
-				ParamCount="2" OptionCount="1" ParamRequired="0"
-				EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0"
-				PhysicalTypeName="">
-				<PARAMS>
-					<PARAM Name="length" />
-					<PARAM Name="decimals" />
-				</PARAMS>
-				<OPTIONS>
-					<OPTION Name="ZEROFILL" Default="0" />
-				</OPTIONS>
-			</DATATYPE>
-			<DATATYPE ID="9" IDGroup="0" TypeName="DOUBLE"
-				Description="A normal-size (double-precision) floating-point number. Cannot be unsigned. Allowable values are -1.7976931348623157E+308 to -2.2250738585072014E-308, 0, and 2.2250738585072014E-308 to 1.7976931348623157E+308."
-				ParamCount="2" OptionCount="1" ParamRequired="0"
-				EditParamsAsString="0" SynonymGroup="2" PhysicalMapping="0"
-				PhysicalTypeName="">
-				<PARAMS>
-					<PARAM Name="length" />
-					<PARAM Name="decimals" />
-				</PARAMS>
-				<OPTIONS>
-					<OPTION Name="ZEROFILL" Default="0" />
-				</OPTIONS>
-			</DATATYPE>
-			<DATATYPE ID="10" IDGroup="0" TypeName="DOUBLE PRECISION"
-				Description="This is a synonym for DOUBLE." ParamCount="2"
-				OptionCount="1" ParamRequired="0" EditParamsAsString="0"
-				SynonymGroup="2" PhysicalMapping="0" PhysicalTypeName="">
-				<PARAMS>
-					<PARAM Name="length" />
-					<PARAM Name="decimals" />
-				</PARAMS>
-				<OPTIONS>
-					<OPTION Name="ZEROFILL" Default="0" />
-				</OPTIONS>
-			</DATATYPE>
-			<DATATYPE ID="11" IDGroup="0" TypeName="REAL"
-				Description="This is a synonym for DOUBLE." ParamCount="2"
-				OptionCount="1" ParamRequired="0" EditParamsAsString="0"
-				SynonymGroup="2" PhysicalMapping="0" PhysicalTypeName="">
-				<PARAMS>
-					<PARAM Name="length" />
-					<PARAM Name="decimals" />
-				</PARAMS>
-				<OPTIONS>
-					<OPTION Name="ZEROFILL" Default="0" />
-				</OPTIONS>
-			</DATATYPE>
-			<DATATYPE ID="12" IDGroup="0" TypeName="DECIMAL"
-				Description="An unpacked floating-point number. Cannot be unsigned. Behaves like a CHAR column."
-				ParamCount="2" OptionCount="1" ParamRequired="0"
-				EditParamsAsString="0" SynonymGroup="3" PhysicalMapping="0"
-				PhysicalTypeName="">
-				<PARAMS>
-					<PARAM Name="length" />
-					<PARAM Name="decimals" />
-				</PARAMS>
-				<OPTIONS>
-					<OPTION Name="ZEROFILL" Default="0" />
-				</OPTIONS>
-			</DATATYPE>
-			<DATATYPE ID="13" IDGroup="0" TypeName="NUMERIC"
-				Description="This is a synonym for DECIMAL." ParamCount="2"
-				OptionCount="1" ParamRequired="1" EditParamsAsString="0"
-				SynonymGroup="3" PhysicalMapping="0" PhysicalTypeName="">
-				<PARAMS>
-					<PARAM Name="length" />
-					<PARAM Name="decimals" />
-				</PARAMS>
-				<OPTIONS>
-					<OPTION Name="ZEROFILL" Default="0" />
-				</OPTIONS>
-			</DATATYPE>
-			<DATATYPE ID="14" IDGroup="1" TypeName="DATE"
-				Description="A date. The supported range is \a1000-01-01\a to \a9999-12-31\a."
-				ParamCount="0" OptionCount="0" ParamRequired="0"
-				EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0"
-				PhysicalTypeName="">
-			</DATATYPE>
-			<DATATYPE ID="15" IDGroup="1" TypeName="DATETIME"
-				Description="A date and time combination. The supported range is \a1000-01-01 00:00:00\a to \a9999-12-31 23:59:59\a."
-				ParamCount="0" OptionCount="0" ParamRequired="0"
-				EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0"
-				PhysicalTypeName="">
-			</DATATYPE>
-			<DATATYPE ID="16" IDGroup="1" TypeName="TIMESTAMP"
-				Description="A timestamp. The range is \a1970-01-01 00:00:00\a to sometime in the year 2037. The length can be 14 (or missing), 12, 10, 8, 6, 4, or 2 representing YYYYMMDDHHMMSS, ... , YYYYMMDD, ... , YY formats."
-				ParamCount="1" OptionCount="0" ParamRequired="0"
-				EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0"
-				PhysicalTypeName="">
-				<PARAMS>
-					<PARAM Name="length" />
-				</PARAMS>
-			</DATATYPE>
-			<DATATYPE ID="17" IDGroup="1" TypeName="TIME"
-				Description="A time. The range is \a-838:59:59\a to \a838:59:59\a."
-				ParamCount="0" OptionCount="0" ParamRequired="0"
-				EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0"
-				PhysicalTypeName="">
-			</DATATYPE>
-			<DATATYPE ID="18" IDGroup="1" TypeName="YEAR"
-				Description="A year in 2- or 4-digit format (default is 4-digit)."
-				ParamCount="1" OptionCount="0" ParamRequired="0"
-				EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0"
-				PhysicalTypeName="">
-				<PARAMS>
-					<PARAM Name="length" />
-				</PARAMS>
-			</DATATYPE>
-			<DATATYPE ID="19" IDGroup="2" TypeName="CHAR"
-				Description="A fixed-length string (1 to 255 characters) that is always right-padded with spaces to the specified length when stored. values are sorted and compared in case-insensitive fashion according to the default character set unless the BINARY keyword is given."
-				ParamCount="1" OptionCount="1" ParamRequired="1"
-				EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0"
-				PhysicalTypeName="">
-				<PARAMS>
-					<PARAM Name="length" />
-				</PARAMS>
-				<OPTIONS>
-					<OPTION Name="BINARY" Default="0" />
-				</OPTIONS>
-			</DATATYPE>
-			<DATATYPE ID="20" IDGroup="2" TypeName="VARCHAR"
-				Description="A variable-length string (1 to 255 characters). Values are sorted and compared in case-sensitive fashion unless the BINARY keyword is given."
-				ParamCount="1" OptionCount="1" ParamRequired="1"
-				EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0"
-				PhysicalTypeName="">
-				<PARAMS>
-					<PARAM Name="length" />
-				</PARAMS>
-				<OPTIONS>
-					<OPTION Name="BINARY" Default="0" />
-				</OPTIONS>
-			</DATATYPE>
-			<DATATYPE ID="21" IDGroup="2" TypeName="BIT"
-				Description="This is a synonym for CHAR(1)." ParamCount="0"
-				OptionCount="0" ParamRequired="0" EditParamsAsString="0"
-				SynonymGroup="0" PhysicalMapping="0" PhysicalTypeName="">
-			</DATATYPE>
-			<DATATYPE ID="22" IDGroup="2" TypeName="BOOL"
-				Description="This is a synonym for CHAR(1)." ParamCount="0"
-				OptionCount="0" ParamRequired="0" EditParamsAsString="0"
-				SynonymGroup="0" PhysicalMapping="0" PhysicalTypeName="">
-			</DATATYPE>
-			<DATATYPE ID="23" IDGroup="3" TypeName="TINYBLOB"
-				Description="A column maximum length of 255 (2^8 - 1) characters. Values are sorted and compared in case-sensitive fashion."
-				ParamCount="0" OptionCount="0" ParamRequired="0"
-				EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0"
-				PhysicalTypeName="">
-			</DATATYPE>
-			<DATATYPE ID="24" IDGroup="3" TypeName="BLOB"
-				Description="A column maximum length of 65535 (2^16 - 1) characters. Values are sorted and compared in case-sensitive fashion."
-				ParamCount="0" OptionCount="0" ParamRequired="0"
-				EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0"
-				PhysicalTypeName="">
-			</DATATYPE>
-			<DATATYPE ID="25" IDGroup="3" TypeName="MEDIUMBLOB"
-				Description="A column maximum length of 16777215 (2^24 - 1) characters. Values are sorted and compared in case-sensitive fashion."
-				ParamCount="0" OptionCount="0" ParamRequired="0"
-				EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0"
-				PhysicalTypeName="">
-			</DATATYPE>
-			<DATATYPE ID="26" IDGroup="3" TypeName="LONGBLOB"
-				Description="A column maximum length of 4294967295 (2^32 - 1) characters. Values are sorted and compared in case-sensitive fashion."
-				ParamCount="0" OptionCount="0" ParamRequired="0"
-				EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0"
-				PhysicalTypeName="">
-			</DATATYPE>
-			<DATATYPE ID="27" IDGroup="3" TypeName="TINYTEXT"
-				Description="A column maximum length of 255 (2^8 - 1) characters."
-				ParamCount="0" OptionCount="0" ParamRequired="0"
-				EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0"
-				PhysicalTypeName="">
-			</DATATYPE>
-			<DATATYPE ID="28" IDGroup="3" TypeName="TEXT"
-				Description="A column maximum length of 65535 (2^16 - 1) characters."
-				ParamCount="0" OptionCount="0" ParamRequired="0"
-				EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0"
-				PhysicalTypeName="">
-			</DATATYPE>
-			<DATATYPE ID="29" IDGroup="3" TypeName="MEDIUMTEXT"
-				Description="A column maximum length of 16777215 (2^24 - 1) characters."
-				ParamCount="0" OptionCount="0" ParamRequired="0"
-				EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0"
-				PhysicalTypeName="">
-			</DATATYPE>
-			<DATATYPE ID="30" IDGroup="3" TypeName="LONGTEXT"
-				Description="A column maximum length of 4294967295 (2^32 - 1) characters."
-				ParamCount="0" OptionCount="0" ParamRequired="0"
-				EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0"
-				PhysicalTypeName="">
-			</DATATYPE>
-			<DATATYPE ID="31" IDGroup="3" TypeName="ENUM"
-				Description="An enumeration. A string object that can have only one value, chosen from the list of values."
-				ParamCount="1" OptionCount="0" ParamRequired="1"
-				EditParamsAsString="1" SynonymGroup="0" PhysicalMapping="0"
-				PhysicalTypeName="">
-				<PARAMS>
-					<PARAM Name="values" />
-				</PARAMS>
-			</DATATYPE>
-			<DATATYPE ID="32" IDGroup="3" TypeName="SET"
-				Description="A set. A string object that can have zero or more values, each of which must be chosen from the list of values."
-				ParamCount="1" OptionCount="0" ParamRequired="1"
-				EditParamsAsString="1" SynonymGroup="0" PhysicalMapping="0"
-				PhysicalTypeName="">
-				<PARAMS>
-					<PARAM Name="values" />
-				</PARAMS>
-			</DATATYPE>
-			<DATATYPE ID="33" IDGroup="4" TypeName="Varchar(20)"
-				Description="" ParamCount="0" OptionCount="1" ParamRequired="0"
-				EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0"
-				PhysicalTypeName="">
-				<OPTIONS>
-					<OPTION Name="BINARY" Default="0" />
-				</OPTIONS>
-			</DATATYPE>
-			<DATATYPE ID="34" IDGroup="4" TypeName="Varchar(45)"
-				Description="" ParamCount="0" OptionCount="1" ParamRequired="0"
-				EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0"
-				PhysicalTypeName="">
-				<OPTIONS>
-					<OPTION Name="BINARY" Default="0" />
-				</OPTIONS>
-			</DATATYPE>
-			<DATATYPE ID="35" IDGroup="4" TypeName="Varchar(255)"
-				Description="" ParamCount="0" OptionCount="1" ParamRequired="0"
-				EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0"
-				PhysicalTypeName="">
-				<OPTIONS>
-					<OPTION Name="BINARY" Default="0" />
-				</OPTIONS>
-			</DATATYPE>
-			<DATATYPE ID="36" IDGroup="5" TypeName="GEOMETRY"
-				Description="Geographic Datatype" ParamCount="0" OptionCount="0"
-				ParamRequired="0" EditParamsAsString="0" SynonymGroup="0"
-				PhysicalMapping="0" PhysicalTypeName="">
-			</DATATYPE>
-			<DATATYPE ID="38" IDGroup="5" TypeName="LINESTRING"
-				Description="Geographic Datatype" ParamCount="0" OptionCount="0"
-				ParamRequired="0" EditParamsAsString="0" SynonymGroup="0"
-				PhysicalMapping="0" PhysicalTypeName="">
-			</DATATYPE>
-			<DATATYPE ID="39" IDGroup="5" TypeName="POLYGON"
-				Description="Geographic Datatype" ParamCount="0" OptionCount="0"
-				ParamRequired="0" EditParamsAsString="0" SynonymGroup="0"
-				PhysicalMapping="0" PhysicalTypeName="">
-			</DATATYPE>
-			<DATATYPE ID="40" IDGroup="5" TypeName="MULTIPOINT"
-				Description="Geographic Datatype" ParamCount="0" OptionCount="0"
-				ParamRequired="0" EditParamsAsString="0" SynonymGroup="0"
-				PhysicalMapping="0" PhysicalTypeName="">
-			</DATATYPE>
-			<DATATYPE ID="41" IDGroup="5" TypeName="MULTILINESTRING"
-				Description="Geographic Datatype" ParamCount="0" OptionCount="0"
-				ParamRequired="0" EditParamsAsString="0" SynonymGroup="0"
-				PhysicalMapping="0" PhysicalTypeName="">
-			</DATATYPE>
-			<DATATYPE ID="42" IDGroup="5" TypeName="MULTIPOLYGON"
-				Description="Geographic Datatype" ParamCount="0" OptionCount="0"
-				ParamRequired="0" EditParamsAsString="0" SynonymGroup="0"
-				PhysicalMapping="0" PhysicalTypeName="">
-			</DATATYPE>
-			<DATATYPE ID="43" IDGroup="5" TypeName="GEOMETRYCOLLECTION"
-				Description="Geographic Datatype" ParamCount="0" OptionCount="0"
-				ParamRequired="0" EditParamsAsString="0" SynonymGroup="0"
-				PhysicalMapping="0" PhysicalTypeName="">
-			</DATATYPE>
-		</DATATYPES>
-		<COMMON_DATATYPES>
-			<COMMON_DATATYPE ID="5" />
-			<COMMON_DATATYPE ID="8" />
-			<COMMON_DATATYPE ID="20" />
-			<COMMON_DATATYPE ID="15" />
-			<COMMON_DATATYPE ID="22" />
-			<COMMON_DATATYPE ID="28" />
-			<COMMON_DATATYPE ID="26" />
-			<COMMON_DATATYPE ID="33" />
-			<COMMON_DATATYPE ID="34" />
-			<COMMON_DATATYPE ID="35" />
-		</COMMON_DATATYPES>
-		<TABLEPREFIXES>
-			<TABLEPREFIX Name="Default (no prefix)" />
-		</TABLEPREFIXES>
-		<REGIONCOLORS>
-			<REGIONCOLOR Color="Red=#FFEEEC" />
-			<REGIONCOLOR Color="Yellow=#FEFDED" />
-			<REGIONCOLOR Color="Green=#EAFFE5" />
-			<REGIONCOLOR Color="Cyan=#ECFDFF" />
-			<REGIONCOLOR Color="Blue=#F0F1FE" />
-			<REGIONCOLOR Color="Magenta=#FFEBFA" />
-		</REGIONCOLORS>
-		<POSITIONMARKERS>
-			<POSITIONMARKER ZoomFac="-1.0" X="0" Y="0" />
-			<POSITIONMARKER ZoomFac="-1.0" X="0" Y="0" />
-			<POSITIONMARKER ZoomFac="-1.0" X="0" Y="0" />
-			<POSITIONMARKER ZoomFac="-1.0" X="0" Y="0" />
-			<POSITIONMARKER ZoomFac="-1.0" X="0" Y="0" />
-			<POSITIONMARKER ZoomFac="-1.0" X="0" Y="0" />
-			<POSITIONMARKER ZoomFac="-1.0" X="0" Y="0" />
-			<POSITIONMARKER ZoomFac="-1.0" X="0" Y="0" />
-			<POSITIONMARKER ZoomFac="-1.0" X="0" Y="0" />
-			<POSITIONMARKER ZoomFac="-1.0" X="0" Y="0" />
-			<POSITIONMARKER ZoomFac="-1.0" X="0" Y="0" />
-		</POSITIONMARKERS>
-	</SETTINGS>
-	<METADATA>
-		<REGIONS>
-			<REGION ID="2956" RegionName="Debug / Info log" XPos="23"
-				YPos="601" Width="750" Height="280" RegionColor="0" TablePrefix="0"
-				TableType="0" OverwriteTablePrefix="0" OverwriteTableType="0"
-				Comments="" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1"
-				OrderPos="21" />
-			<REGION ID="2955" RegionName="Statistics logger" XPos="838"
-				YPos="25" Width="582" Height="650" RegionColor="4" TablePrefix="0"
-				TableType="0" OverwriteTablePrefix="0" OverwriteTableType="0"
-				Comments="" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1"
-				OrderPos="20" />
-			<REGION ID="2954" RegionName="SQL query profiling"
-				XPos="800" YPos="700" Width="233" Height="181" RegionColor="3"
-				TablePrefix="0" TableType="0" OverwriteTablePrefix="0"
-				OverwriteTableType="0" Comments="" IsLinkedObject="0"
-				IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="19" />
-			<REGION ID="2953" RegionName="Users \+ Permissions"
-				XPos="533" YPos="33" Width="264" Height="331" RegionColor="2"
-				TablePrefix="0" TableType="0" OverwriteTablePrefix="0"
-				OverwriteTableType="0" Comments="" IsLinkedObject="0"
-				IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="18" />
-			<REGION ID="2952" RegionName="Archived data" XPos="25"
-				YPos="28" Width="301" Height="484" RegionColor="1" TablePrefix="0"
-				TableType="0" OverwriteTablePrefix="0" OverwriteTableType="0"
-				Comments="" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1"
-				OrderPos="17" />
-			<REGION ID="2949" RegionName="Site" XPos="368" YPos="387"
-				Width="451" Height="161" RegionColor="0" TablePrefix="0"
-				TableType="0" OverwriteTablePrefix="0" OverwriteTableType="0"
-				Comments="" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1"
-				OrderPos="18" />
-		</REGIONS>
-		<TABLES>
-			<TABLE ID="2797" Tablename="piwik_access" PrevTableName=""
-				XPos="581" YPos="282" TableType="0" TablePrefix="0" nmTable="0"
-				Temporary="0" UseStandardInserts="0" StandardInserts=""
-				TableOptions="" Comments="" Collapsed="0" IsLinkedObject="0"
-				IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="2">
-				<COLUMNS>
-					<COLUMN ID="2813" ColName="login" PrevColName=""
-						Pos="1" idDatatype="20" DatatypeParams="(20)" Width="0" Prec="0"
-						PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="1"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2814" ColName="idsite" PrevColName=""
-						Pos="2" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0"
-						PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="1" />
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2815" ColName="access" PrevColName=""
-						Pos="3" idDatatype="20" DatatypeParams="(10)" Width="0" Prec="0"
-						PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-				</COLUMNS>
-				<RELATIONS_END>
-					<RELATION_END ID="2959" />
-				</RELATIONS_END>
-				<INDICES>
-					<INDEX ID="2816" IndexName="PRIMARY" IndexKind="0"
-						FKRefDef_Obj_id="-1">
-						<INDEXCOLUMNS>
-							<INDEXCOLUMN idColumn="2813"
-								LengthParam="0" />
-							<INDEXCOLUMN idColumn="2814"
-								LengthParam="0" />
-						</INDEXCOLUMNS>
-					</INDEX>
-				</INDICES>
-			</TABLE>
-			<TABLE ID="2799" Tablename="piwik_archive_blob_YEAR_MONTH"
-				PrevTableName="piwik_archive_blob_2008_01" XPos="52" YPos="106"
-				TableType="0" TablePrefix="0" nmTable="0" Temporary="0"
-				UseStandardInserts="0" StandardInserts="\n"
-				TableOptions="DelayKeyTblUpdates=0\nPackKeys=0\nRowChecksum=0\nRowFormat=0\nUseRaid=0\nRaidType=0\n"
-				Comments="" Collapsed="0" IsLinkedObject="0" IDLinkedModel="-1"
-				Obj_id_Linked="-1" OrderPos="4">
-				<COLUMNS>
-					<COLUMN ID="2826" ColName="idarchive" PrevColName=""
-						Pos="1" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0"
-						PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="1" />
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2827" ColName="name" PrevColName=""
-						Pos="2" idDatatype="20" DatatypeParams="(255)" Width="0" Prec="0"
-						PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2828" ColName="idsite" PrevColName=""
-						Pos="3" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0"
-						PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="1" />
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2829" ColName="date1" PrevColName=""
-						Pos="4" idDatatype="14" DatatypeParams="" Width="0" Prec="0"
-						PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED></OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2830" ColName="date2" PrevColName=""
-						Pos="5" idDatatype="14" DatatypeParams="" Width="0" Prec="0"
-						PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED></OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2831" ColName="period" PrevColName=""
-						Pos="6" idDatatype="1" DatatypeParams="(3)" Width="0" Prec="0"
-						PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="1" />
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2832" ColName="ts_archived"
-						PrevColName="" Pos="7" idDatatype="15" DatatypeParams="" Width="0"
-						Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED></OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2833" ColName="value" PrevColName=""
-						Pos="8" idDatatype="24" DatatypeParams="" Width="0" Prec="0"
-						PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED></OPTIONSELECTED>
-					</COLUMN>
-				</COLUMNS>
-				<INDICES>
-					<INDEX ID="2834" IndexName="PRIMARY" IndexKind="0"
-						FKRefDef_Obj_id="-1">
-						<INDEXCOLUMNS>
-							<INDEXCOLUMN idColumn="2826"
-								LengthParam="0" />
-							<INDEXCOLUMN idColumn="2827"
-								LengthParam="0" />
-						</INDEXCOLUMNS>
-					</INDEX>
-				</INDICES>
-			</TABLE>
-			<TABLE ID="2801"
-				Tablename="piwik_archive_numeric_YEAR_MONTH"
-				PrevTableName="piwik_archive_numeric_2008_01" XPos="43" YPos="294"
-				TableType="0" TablePrefix="0" nmTable="0" Temporary="0"
-				UseStandardInserts="0" StandardInserts="\n"
-				TableOptions="DelayKeyTblUpdates=0\nPackKeys=0\nRowChecksum=0\nRowFormat=0\nUseRaid=0\nRaidType=0\n"
-				Comments="" Collapsed="0" IsLinkedObject="0" IDLinkedModel="-1"
-				Obj_id_Linked="-1" OrderPos="6">
-				<COLUMNS>
-					<COLUMN ID="2844" ColName="idarchive" PrevColName=""
-						Pos="1" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0"
-						PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="1" />
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2845" ColName="name" PrevColName=""
-						Pos="2" idDatatype="20" DatatypeParams="(255)" Width="0" Prec="0"
-						PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2846" ColName="idsite" PrevColName=""
-						Pos="3" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0"
-						PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="1" />
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2847" ColName="date1" PrevColName=""
-						Pos="4" idDatatype="14" DatatypeParams="" Width="0" Prec="0"
-						PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED></OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2848" ColName="date2" PrevColName=""
-						Pos="5" idDatatype="14" DatatypeParams="" Width="0" Prec="0"
-						PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED></OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2849" ColName="period" PrevColName=""
-						Pos="6" idDatatype="1" DatatypeParams="(3)" Width="0" Prec="0"
-						PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="1" />
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2850" ColName="ts_archived"
-						PrevColName="" Pos="7" idDatatype="15" DatatypeParams="" Width="0"
-						Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED></OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2851" ColName="value" PrevColName=""
-						Pos="8" idDatatype="7" DatatypeParams="" Width="0" Prec="0"
-						PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-				</COLUMNS>
-				<INDICES>
-					<INDEX ID="2852" IndexName="PRIMARY" IndexKind="0"
-						FKRefDef_Obj_id="-1">
-						<INDEXCOLUMNS>
-							<INDEXCOLUMN idColumn="2844"
-								LengthParam="0" />
-							<INDEXCOLUMN idColumn="2845"
-								LengthParam="0" />
-						</INDEXCOLUMNS>
-					</INDEX>
-				</INDICES>
-			</TABLE>
-			<TABLE ID="2802" Tablename="piwik_log_action"
-				PrevTableName="" XPos="946" YPos="296" TableType="0" TablePrefix="0"
-				nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts=""
-				TableOptions="" Comments="" Collapsed="0" IsLinkedObject="0"
-				IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="7">
-				<COLUMNS>
-					<COLUMN ID="2853" ColName="idaction" PrevColName=""
-						Pos="1" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0"
-						PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="1" />
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2854" ColName="name" PrevColName=""
-						Pos="2" idDatatype="20" DatatypeParams="(255)" Width="0" Prec="0"
-						PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2855" ColName="type" PrevColName=""
-						Pos="3" idDatatype="1" DatatypeParams="(3)" Width="0" Prec="0"
-						PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="1" />
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-				</COLUMNS>
-				<RELATIONS_START>
-					<RELATION_START ID="2966" />
-					<RELATION_START ID="2967" />
-				</RELATIONS_START>
-				<INDICES>
-					<INDEX ID="2856" IndexName="PRIMARY" IndexKind="0"
-						FKRefDef_Obj_id="-1">
-						<INDEXCOLUMNS>
-							<INDEXCOLUMN idColumn="2853"
-								LengthParam="0" />
-						</INDEXCOLUMNS>
-					</INDEX>
-				</INDICES>
-			</TABLE>
-			<TABLE ID="2803" Tablename="piwik_log_link_visit_action"
-				PrevTableName="" XPos="862" YPos="442" TableType="0" TablePrefix="0"
-				nmTable="0" Temporary="0" UseStandardInserts="0"
-				StandardInserts="\n"
-				TableOptions="DelayKeyTblUpdates=0\nPackKeys=0\nRowChecksum=0\nRowFormat=0\nUseRaid=0\nRaidType=0\n"
-				Comments="" Collapsed="0" IsLinkedObject="0" IDLinkedModel="-1"
-				Obj_id_Linked="-1" OrderPos="8">
-				<COLUMNS>
-					<COLUMN ID="2857" ColName="idlink_va" PrevColName=""
-						Pos="1" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0"
-						PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="0" />
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2858" ColName="idvisit" PrevColName=""
-						Pos="2" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0"
-						PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="1"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="1" />
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2859" ColName="idaction" PrevColName=""
-						Pos="3" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0"
-						PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="1"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="1" />
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2860" ColName="idaction_ref"
-						PrevColName="" Pos="4" idDatatype="5" DatatypeParams="(10)"
-						Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0"
-						IsForeignKey="1" DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="1" />
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2861" ColName="time_spent_ref_action"
-						PrevColName="" Pos="5" idDatatype="5" DatatypeParams="(10)"
-						Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0"
-						IsForeignKey="0" DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="1" />
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-				</COLUMNS>
-				<RELATIONS_END>
-					<RELATION_END ID="2962" />
-					<RELATION_END ID="2966" />
-					<RELATION_END ID="2967" />
-				</RELATIONS_END>
-				<INDICES>
-					<INDEX ID="2862" IndexName="PRIMARY" IndexKind="0"
-						FKRefDef_Obj_id="-1">
-						<INDEXCOLUMNS>
-							<INDEXCOLUMN idColumn="2857"
-								LengthParam="0" />
-						</INDEXCOLUMNS>
-					</INDEX>
-				</INDICES>
-			</TABLE>
-			<TABLE ID="2804" Tablename="piwik_log_profiling"
-				PrevTableName="" XPos="843" YPos="754" TableType="0" TablePrefix="0"
-				nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts=""
-				TableOptions="" Comments="" Collapsed="0" IsLinkedObject="0"
-				IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="9">
-				<COLUMNS>
-					<COLUMN ID="2863" ColName="query" PrevColName=""
-						Pos="1" idDatatype="28" DatatypeParams="" Width="0" Prec="0"
-						PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED></OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2864" ColName="count" PrevColName=""
-						Pos="2" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0"
-						PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="1" />
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2865" ColName="sum_time_ms"
-						PrevColName="" Pos="3" idDatatype="7" DatatypeParams="" Width="0"
-						Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-				</COLUMNS>
-				<INDICES>
-					<INDEX ID="2866" IndexName="query" IndexKind="1"
-						FKRefDef_Obj_id="-1">
-						<INDEXCOLUMNS>
-							<INDEXCOLUMN idColumn="2863"
-								LengthParam="0" />
-						</INDEXCOLUMNS>
-					</INDEX>
-				</INDICES>
-			</TABLE>
-			<TABLE ID="2805" Tablename="piwik_log_visit"
-				PrevTableName="" XPos="1146" YPos="43" TableType="0" TablePrefix="0"
-				nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts=""
-				TableOptions="" Comments="" Collapsed="0" IsLinkedObject="0"
-				IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="10">
-				<COLUMNS>
-					<COLUMN ID="2867" ColName="idvisit" PrevColName=""
-						Pos="1" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0"
-						PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="1" />
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2868" ColName="idsite" PrevColName=""
-						Pos="2" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0"
-						PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="1" />
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2869" ColName="visitor_localtime"
-						PrevColName="" Pos="3" idDatatype="17" DatatypeParams="" Width="0"
-						Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED></OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2870" ColName="visitor_idcookie"
-						PrevColName="" Pos="4" idDatatype="19" DatatypeParams="(32)"
-						Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0"
-						IsForeignKey="0" DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2871" ColName="visitor_returning"
-						PrevColName="" Pos="5" idDatatype="1" DatatypeParams="(1)"
-						Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0"
-						IsForeignKey="0" DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="0" />
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2872" ColName="visit_first_action_time"
-						PrevColName="" Pos="6" idDatatype="15" DatatypeParams="" Width="0"
-						Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED></OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2873" ColName="visit_last_action_time"
-						PrevColName="" Pos="7" idDatatype="15" DatatypeParams="" Width="0"
-						Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED></OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2874" ColName="visit_server_date"
-						PrevColName="" Pos="8" idDatatype="14" DatatypeParams="" Width="0"
-						Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED></OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2875" ColName="visit_exit_idaction"
-						PrevColName="" Pos="9" idDatatype="5" DatatypeParams="(11)"
-						Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0"
-						IsForeignKey="0" DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="0" />
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2876" ColName="visit_entry_idaction"
-						PrevColName="" Pos="10" idDatatype="5" DatatypeParams="(11)"
-						Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0"
-						IsForeignKey="0" DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="0" />
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2877" ColName="visit_total_actions"
-						PrevColName="" Pos="11" idDatatype="2" DatatypeParams="(5)"
-						Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0"
-						IsForeignKey="0" DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="1" />
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2878" ColName="visit_total_time"
-						PrevColName="" Pos="12" idDatatype="2" DatatypeParams="(5)"
-						Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0"
-						IsForeignKey="0" DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="1" />
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2879" ColName="referer_type"
-						PrevColName="" Pos="13" idDatatype="5" DatatypeParams="(10)"
-						Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0"
-						IsForeignKey="0" DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="1" />
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2880" ColName="referer_name"
-						PrevColName="" Pos="14" idDatatype="20" DatatypeParams="(70)"
-						Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0"
-						IsForeignKey="0" DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2881" ColName="referer_url"
-						PrevColName="" Pos="15" idDatatype="28" DatatypeParams=""
-						Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0"
-						IsForeignKey="0" DefaultValue="" Comments="">
-						<OPTIONSELECTED></OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2882" ColName="referer_keyword"
-						PrevColName="" Pos="16" idDatatype="20" DatatypeParams="(255)"
-						Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0"
-						IsForeignKey="0" DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2883" ColName="config_md5config"
-						PrevColName="" Pos="17" idDatatype="19" DatatypeParams="(32)"
-						Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0"
-						IsForeignKey="0" DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2884" ColName="config_os" PrevColName=""
-						Pos="18" idDatatype="19" DatatypeParams="(3)" Width="0" Prec="0"
-						PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2885" ColName="config_browser_name"
-						PrevColName="" Pos="19" idDatatype="20" DatatypeParams="(10)"
-						Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0"
-						IsForeignKey="0" DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2886" ColName="config_browser_version"
-						PrevColName="" Pos="20" idDatatype="20" DatatypeParams="(20)"
-						Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0"
-						IsForeignKey="0" DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2887" ColName="config_resolution"
-						PrevColName="" Pos="21" idDatatype="20" DatatypeParams="(9)"
-						Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0"
-						IsForeignKey="0" DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2888" ColName="config_color_depth"
-						PrevColName="" Pos="22" idDatatype="1" DatatypeParams="(2)"
-						Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0"
-						IsForeignKey="0" DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="1" />
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2889" ColName="config_pdf"
-						PrevColName="" Pos="23" idDatatype="1" DatatypeParams="(1)"
-						Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0"
-						IsForeignKey="0" DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="0" />
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2890" ColName="config_flash"
-						PrevColName="" Pos="24" idDatatype="1" DatatypeParams="(1)"
-						Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0"
-						IsForeignKey="0" DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="0" />
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2891" ColName="config_java"
-						PrevColName="" Pos="25" idDatatype="1" DatatypeParams="(1)"
-						Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0"
-						IsForeignKey="0" DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="0" />
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2892" ColName="config_director"
-						PrevColName="" Pos="26" idDatatype="1" DatatypeParams="(1)"
-						Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0"
-						IsForeignKey="0" DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="0" />
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2893" ColName="config_quicktime"
-						PrevColName="" Pos="27" idDatatype="1" DatatypeParams="(1)"
-						Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0"
-						IsForeignKey="0" DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="0" />
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2894" ColName="config_realplayer"
-						PrevColName="" Pos="28" idDatatype="1" DatatypeParams="(1)"
-						Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0"
-						IsForeignKey="0" DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="0" />
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2895" ColName="config_windowsmedia"
-						PrevColName="" Pos="29" idDatatype="1" DatatypeParams="(1)"
-						Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0"
-						IsForeignKey="0" DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="0" />
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2896" ColName="config_cookie"
-						PrevColName="" Pos="30" idDatatype="1" DatatypeParams="(1)"
-						Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0"
-						IsForeignKey="0" DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="0" />
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2897" ColName="location_ip"
-						PrevColName="" Pos="31" idDatatype="6" DatatypeParams="(11)"
-						Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0"
-						IsForeignKey="0" DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="0" />
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2898" ColName="location_browser_lang"
-						PrevColName="" Pos="32" idDatatype="20" DatatypeParams="(20)"
-						Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0"
-						IsForeignKey="0" DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2899" ColName="location_country"
-						PrevColName="" Pos="33" idDatatype="19" DatatypeParams="(3)"
-						Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0"
-						IsForeignKey="0" DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2901" ColName="location_provider"
-						PrevColName="" Pos="35" idDatatype="20" DatatypeParams="(100)"
-						Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0"
-						IsForeignKey="0" DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-				</COLUMNS>
-				<RELATIONS_START>
-					<RELATION_START ID="2962" />
-				</RELATIONS_START>
-				<INDICES>
-					<INDEX ID="2902" IndexName="PRIMARY" IndexKind="0"
-						FKRefDef_Obj_id="-1">
-						<INDEXCOLUMNS>
-							<INDEXCOLUMN idColumn="2867"
-								LengthParam="0" />
-						</INDEXCOLUMNS>
-					</INDEX>
-				</INDICES>
-			</TABLE>
-			<TABLE ID="2806" Tablename="piwik_logger_api_call"
-				PrevTableName="" XPos="474" YPos="637" TableType="0" TablePrefix="0"
-				nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts=""
-				TableOptions="" Comments="" Collapsed="0" IsLinkedObject="0"
-				IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="11">
-				<COLUMNS>
-					<COLUMN ID="2903" ColName="idlogger_api_call"
-						PrevColName="" Pos="1" idDatatype="5" DatatypeParams="(10)"
-						Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0"
-						IsForeignKey="0" DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="1" />
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2904" ColName="class_name"
-						PrevColName="" Pos="2" idDatatype="20" DatatypeParams="(255)"
-						Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0"
-						IsForeignKey="0" DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2905" ColName="method_name"
-						PrevColName="" Pos="3" idDatatype="20" DatatypeParams="(255)"
-						Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0"
-						IsForeignKey="0" DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2906"
-						ColName="parameter_names_default_values" PrevColName="" Pos="4"
-						idDatatype="27" DatatypeParams="" Width="0" Prec="0"
-						PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED></OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2907" ColName="parameter_values"
-						PrevColName="" Pos="5" idDatatype="27" DatatypeParams="" Width="0"
-						Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED></OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2908" ColName="execution_time"
-						PrevColName="" Pos="6" idDatatype="7" DatatypeParams="" Width="0"
-						Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2909" ColName="caller_ip" PrevColName=""
-						Pos="7" idDatatype="6" DatatypeParams="(20)" Width="0" Prec="0"
-						PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="0" />
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2910" ColName="timestamp" PrevColName=""
-						Pos="8" idDatatype="16" DatatypeParams="" Width="0" Prec="0"
-						PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED></OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2911" ColName="returned_value"
-						PrevColName="" Pos="9" idDatatype="27" DatatypeParams="" Width="0"
-						Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED></OPTIONSELECTED>
-					</COLUMN>
-				</COLUMNS>
-				<INDICES>
-					<INDEX ID="2912" IndexName="PRIMARY" IndexKind="0"
-						FKRefDef_Obj_id="-1">
-						<INDEXCOLUMNS>
-							<INDEXCOLUMN idColumn="2903"
-								LengthParam="0" />
-						</INDEXCOLUMNS>
-					</INDEX>
-				</INDICES>
-			</TABLE>
-			<TABLE ID="2807" Tablename="piwik_logger_error"
-				PrevTableName="" XPos="38" YPos="683" TableType="0" TablePrefix="0"
-				nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts=""
-				TableOptions="" Comments="" Collapsed="0" IsLinkedObject="0"
-				IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="12">
-				<COLUMNS>
-					<COLUMN ID="2913" ColName="idlogger_error"
-						PrevColName="" Pos="1" idDatatype="5" DatatypeParams="(10)"
-						Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0"
-						IsForeignKey="0" DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="1" />
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2914" ColName="timestamp" PrevColName=""
-						Pos="2" idDatatype="16" DatatypeParams="" Width="0" Prec="0"
-						PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED></OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2915" ColName="message" PrevColName=""
-						Pos="3" idDatatype="27" DatatypeParams="" Width="0" Prec="0"
-						PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED></OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2916" ColName="errno" PrevColName=""
-						Pos="4" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0"
-						PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="1" />
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2917" ColName="errline" PrevColName=""
-						Pos="5" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0"
-						PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="1" />
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2918" ColName="errfile" PrevColName=""
-						Pos="6" idDatatype="20" DatatypeParams="(255)" Width="0" Prec="0"
-						PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2919" ColName="backtrace" PrevColName=""
-						Pos="7" idDatatype="28" DatatypeParams="" Width="0" Prec="0"
-						PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED></OPTIONSELECTED>
-					</COLUMN>
-				</COLUMNS>
-				<INDICES>
-					<INDEX ID="2920" IndexName="PRIMARY" IndexKind="0"
-						FKRefDef_Obj_id="-1">
-						<INDEXCOLUMNS>
-							<INDEXCOLUMN idColumn="2913"
-								LengthParam="0" />
-						</INDEXCOLUMNS>
-					</INDEX>
-				</INDICES>
-			</TABLE>
-			<TABLE ID="2808" Tablename="piwik_logger_exception"
-				PrevTableName="" XPos="246" YPos="722" TableType="0" TablePrefix="0"
-				nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts=""
-				TableOptions="" Comments="" Collapsed="0" IsLinkedObject="0"
-				IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="13">
-				<COLUMNS>
-					<COLUMN ID="2921" ColName="idlogger_exception"
-						PrevColName="" Pos="1" idDatatype="5" DatatypeParams="(10)"
-						Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0"
-						IsForeignKey="0" DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="1" />
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2922" ColName="timestamp" PrevColName=""
-						Pos="2" idDatatype="16" DatatypeParams="" Width="0" Prec="0"
-						PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED></OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2923" ColName="message" PrevColName=""
-						Pos="3" idDatatype="27" DatatypeParams="" Width="0" Prec="0"
-						PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED></OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2924" ColName="errno" PrevColName=""
-						Pos="4" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0"
-						PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="1" />
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2925" ColName="errline" PrevColName=""
-						Pos="5" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0"
-						PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="1" />
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2926" ColName="errfile" PrevColName=""
-						Pos="6" idDatatype="20" DatatypeParams="(255)" Width="0" Prec="0"
-						PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2927" ColName="backtrace" PrevColName=""
-						Pos="7" idDatatype="28" DatatypeParams="" Width="0" Prec="0"
-						PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED></OPTIONSELECTED>
-					</COLUMN>
-				</COLUMNS>
-				<INDICES>
-					<INDEX ID="2928" IndexName="PRIMARY" IndexKind="0"
-						FKRefDef_Obj_id="-1">
-						<INDEXCOLUMNS>
-							<INDEXCOLUMN idColumn="2921"
-								LengthParam="0" />
-						</INDEXCOLUMNS>
-					</INDEX>
-				</INDICES>
-			</TABLE>
-			<TABLE ID="2809" Tablename="piwik_logger_message"
-				PrevTableName="" XPos="254" YPos="632" TableType="0" TablePrefix="0"
-				nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts=""
-				TableOptions="" Comments="" Collapsed="0" IsLinkedObject="0"
-				IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="14">
-				<COLUMNS>
-					<COLUMN ID="2929" ColName="idlogger_message"
-						PrevColName="" Pos="1" idDatatype="5" DatatypeParams="(10)"
-						Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0"
-						IsForeignKey="0" DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="1" />
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2930" ColName="timestamp" PrevColName=""
-						Pos="2" idDatatype="16" DatatypeParams="" Width="0" Prec="0"
-						PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED></OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2931" ColName="message" PrevColName=""
-						Pos="3" idDatatype="27" DatatypeParams="" Width="0" Prec="0"
-						PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED></OPTIONSELECTED>
-					</COLUMN>
-				</COLUMNS>
-				<INDICES>
-					<INDEX ID="2932" IndexName="PRIMARY" IndexKind="0"
-						FKRefDef_Obj_id="-1">
-						<INDEXCOLUMNS>
-							<INDEXCOLUMN idColumn="2929"
-								LengthParam="0" />
-						</INDEXCOLUMNS>
-					</INDEX>
-				</INDICES>
-			</TABLE>
-			<TABLE ID="2810" Tablename="piwik_site" PrevTableName=""
-				XPos="379" YPos="430" TableType="0" TablePrefix="0" nmTable="0"
-				Temporary="0" UseStandardInserts="0" StandardInserts=""
-				TableOptions="" Comments="" Collapsed="0" IsLinkedObject="0"
-				IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="15">
-				<COLUMNS>
-					<COLUMN ID="2933" ColName="idsite" PrevColName=""
-						Pos="1" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0"
-						PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="1" />
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2934" ColName="name" PrevColName=""
-						Pos="2" idDatatype="20" DatatypeParams="(90)" Width="0" Prec="0"
-						PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2935" ColName="main_url" PrevColName=""
-						Pos="3" idDatatype="20" DatatypeParams="(255)" Width="0" Prec="0"
-						PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2936" ColName="ts_created"
-						PrevColName="" Pos="4" idDatatype="16" DatatypeParams="" Width="0"
-						Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="CURRENT_TIMESTAMP" Comments="">
-						<OPTIONSELECTED></OPTIONSELECTED>
-					</COLUMN>
-				</COLUMNS>
-				<RELATIONS_START>
-					<RELATION_START ID="2958" />
-				</RELATIONS_START>
-				<INDICES>
-					<INDEX ID="2937" IndexName="PRIMARY" IndexKind="0"
-						FKRefDef_Obj_id="-1">
-						<INDEXCOLUMNS>
-							<INDEXCOLUMN idColumn="2933"
-								LengthParam="0" />
-						</INDEXCOLUMNS>
-					</INDEX>
-				</INDICES>
-			</TABLE>
-			<TABLE ID="2811" Tablename="piwik_site_url" PrevTableName=""
-				XPos="622" YPos="433" TableType="0" TablePrefix="0" nmTable="0"
-				Temporary="0" UseStandardInserts="0" StandardInserts=""
-				TableOptions="" Comments="" Collapsed="0" IsLinkedObject="0"
-				IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="16">
-				<COLUMNS>
-					<COLUMN ID="2938" ColName="idsite" PrevColName=""
-						Pos="1" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0"
-						PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="1"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="1" />
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2939" ColName="url" PrevColName=""
-						Pos="2" idDatatype="20" DatatypeParams="(255)" Width="0" Prec="0"
-						PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-				</COLUMNS>
-				<RELATIONS_END>
-					<RELATION_END ID="2958" />
-				</RELATIONS_END>
-				<INDICES>
-					<INDEX ID="2940" IndexName="PRIMARY" IndexKind="0"
-						FKRefDef_Obj_id="-1">
-						<INDEXCOLUMNS>
-							<INDEXCOLUMN idColumn="2938"
-								LengthParam="0" />
-							<INDEXCOLUMN idColumn="2939"
-								LengthParam="0" />
-						</INDEXCOLUMNS>
-					</INDEX>
-				</INDICES>
-			</TABLE>
-			<TABLE ID="2812" Tablename="piwik_user" PrevTableName=""
-				XPos="572" YPos="67" TableType="0" TablePrefix="0" nmTable="0"
-				Temporary="0" UseStandardInserts="0" StandardInserts=""
-				TableOptions="" Comments="" Collapsed="0" IsLinkedObject="0"
-				IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="17">
-				<COLUMNS>
-					<COLUMN ID="2941" ColName="login" PrevColName=""
-						Pos="1" idDatatype="20" DatatypeParams="(20)" Width="0" Prec="0"
-						PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2942" ColName="password" PrevColName=""
-						Pos="2" idDatatype="19" DatatypeParams="(32)" Width="0" Prec="0"
-						PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2943" ColName="alias" PrevColName=""
-						Pos="3" idDatatype="20" DatatypeParams="(45)" Width="0" Prec="0"
-						PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2944" ColName="email" PrevColName=""
-						Pos="4" idDatatype="20" DatatypeParams="(100)" Width="0" Prec="0"
-						PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2945" ColName="token_auth"
-						PrevColName="" Pos="5" idDatatype="19" DatatypeParams="(32)"
-						Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0"
-						IsForeignKey="0" DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2946" ColName="date_registered"
-						PrevColName="" Pos="6" idDatatype="16" DatatypeParams="" Width="0"
-						Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="CURRENT_TIMESTAMP" Comments="">
-						<OPTIONSELECTED></OPTIONSELECTED>
-					</COLUMN>
-				</COLUMNS>
-				<RELATIONS_START>
-					<RELATION_START ID="2959" />
-				</RELATIONS_START>
-				<INDICES>
-					<INDEX ID="2947" IndexName="PRIMARY" IndexKind="0"
-						FKRefDef_Obj_id="-1">
-						<INDEXCOLUMNS>
-							<INDEXCOLUMN idColumn="2941"
-								LengthParam="0" />
-						</INDEXCOLUMNS>
-					</INDEX>
-					<INDEX ID="2948" IndexName="uniq_keytoken"
-						IndexKind="1" FKRefDef_Obj_id="-1">
-						<INDEXCOLUMNS>
-							<INDEXCOLUMN idColumn="2945"
-								LengthParam="0" />
-						</INDEXCOLUMNS>
-					</INDEX>
-				</INDICES>
-			</TABLE>
-		</TABLES>
-		<RELATIONS>
-			<RELATION ID="2958" RelationName="Rel_01" Kind="2"
-				SrcTable="2810" DestTable="2811" FKFields="idsite=idsite\n"
-				FKFieldsComments="\n" relDirection="2" MidOffset="0"
-				OptionalStart="0" OptionalEnd="0" CaptionOffsetX="0"
-				CaptionOffsetY="0" StartIntervalOffsetX="0" StartIntervalOffsetY="0"
-				EndIntervalOffsetX="0" EndIntervalOffsetY="0" CreateRefDef="1"
-				Invisible="0" RefDef="Matching=0\nOnDelete=3\nOnUpdate=3\n"
-				Comments="" FKRefDefIndex_Obj_id="-1" Splitted="0"
-				IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1"
-				OrderPos="22" />
-			<RELATION ID="2959" RelationName="Rel_02" Kind="2"
-				SrcTable="2812" DestTable="2797" FKFields="login=login\n"
-				FKFieldsComments="\n" relDirection="3" MidOffset="0"
-				OptionalStart="0" OptionalEnd="0" CaptionOffsetX="0"
-				CaptionOffsetY="0" StartIntervalOffsetX="0" StartIntervalOffsetY="0"
-				EndIntervalOffsetX="0" EndIntervalOffsetY="0" CreateRefDef="1"
-				Invisible="0" RefDef="Matching=0\nOnDelete=3\nOnUpdate=3\n"
-				Comments="" FKRefDefIndex_Obj_id="-1" Splitted="0"
-				IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1"
-				OrderPos="23" />
-			<RELATION ID="2962" RelationName="Rel_03" Kind="2"
-				SrcTable="2805" DestTable="2803" FKFields="idvisit=idvisit\n"
-				FKFieldsComments="\n" relDirection="4" MidOffset="0"
-				OptionalStart="0" OptionalEnd="0" CaptionOffsetX="0"
-				CaptionOffsetY="0" StartIntervalOffsetX="0" StartIntervalOffsetY="0"
-				EndIntervalOffsetX="0" EndIntervalOffsetY="0" CreateRefDef="1"
-				Invisible="0" RefDef="Matching=0\nOnDelete=3\nOnUpdate=3\n"
-				Comments="" FKRefDefIndex_Obj_id="-1" Splitted="0"
-				IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1"
-				OrderPos="24" />
-			<RELATION ID="2966" RelationName="Rel_06" Kind="2"
-				SrcTable="2802" DestTable="2803" FKFields="idaction=idaction\n"
-				FKFieldsComments="\n" relDirection="3" MidOffset="0"
-				OptionalStart="0" OptionalEnd="0" CaptionOffsetX="0"
-				CaptionOffsetY="0" StartIntervalOffsetX="0" StartIntervalOffsetY="0"
-				EndIntervalOffsetX="0" EndIntervalOffsetY="0" CreateRefDef="1"
-				Invisible="0" RefDef="Matching=0\nOnDelete=3\nOnUpdate=3\n"
-				Comments="" FKRefDefIndex_Obj_id="-1" Splitted="0"
-				IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1"
-				OrderPos="27" />
-			<RELATION ID="2967" RelationName="Rel_07" Kind="2"
-				SrcTable="2802" DestTable="2803" FKFields="idaction=idaction_ref\n"
-				FKFieldsComments="\n" relDirection="3" MidOffset="0"
-				OptionalStart="0" OptionalEnd="0" CaptionOffsetX="0"
-				CaptionOffsetY="0" StartIntervalOffsetX="0" StartIntervalOffsetY="0"
-				EndIntervalOffsetX="0" EndIntervalOffsetY="0" CreateRefDef="1"
-				Invisible="0" RefDef="Matching=0\nOnDelete=3\nOnUpdate=3\n"
-				Comments="" FKRefDefIndex_Obj_id="-1" Splitted="0"
-				IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1"
-				OrderPos="26" />
-		</RELATIONS>
-		<NOTES></NOTES>
-		<IMAGES></IMAGES>
-	</METADATA>
-	<PLUGINDATA>
-		<PLUGINDATARECORDS></PLUGINDATARECORDS>
-	</PLUGINDATA>
-	<QUERYDATA>
-		<QUERYRECORDS></QUERYRECORDS>
-	</QUERYDATA>
-	<LINKEDMODELS></LINKEDMODELS>
-</DBMODEL>
diff --git a/misc/others/diagram_general_request.jpg b/misc/others/diagram_general_request.jpg
deleted file mode 100644
index 7d3174a05c6048a9d94783a2fcf62990d839ef8d..0000000000000000000000000000000000000000
Binary files a/misc/others/diagram_general_request.jpg and /dev/null differ
diff --git a/misc/others/diagram_general_request.vsd b/misc/others/diagram_general_request.vsd
deleted file mode 100644
index d1581e3855fcf3db172a660ca7cb5bfadf971d55..0000000000000000000000000000000000000000
Binary files a/misc/others/diagram_general_request.vsd and /dev/null differ
diff --git a/misc/others/generateDoc.bat b/misc/others/generateDoc.bat
deleted file mode 100644
index b99167cb81db2e1cf881de63942238a2af8f1ec4..0000000000000000000000000000000000000000
--- a/misc/others/generateDoc.bat
+++ /dev/null
@@ -1,3 +0,0 @@
-cd ..
-"C:\Program Files\EasyPHP 2.0b1\php5\php.exe" libs\PhpDocumentor-1.3.2\phpdoc -c misc\phpdoc-config.ini
-pause
\ No newline at end of file
diff --git a/misc/others/generateDoc.sh b/misc/others/generateDoc.sh
deleted file mode 100644
index a6137790d9f735f08eafcf55d83ff7e642896576..0000000000000000000000000000000000000000
--- a/misc/others/generateDoc.sh
+++ /dev/null
@@ -1 +0,0 @@
-libs/PhpDocumentor-1.3.2/phpdoc -c misc/phpdoc-config.ini
diff --git a/misc/others/phpdoc-config.ini b/misc/others/phpdoc-config.ini
deleted file mode 100644
index 037ede38a938b883d0c35c872e79ad422896026e..0000000000000000000000000000000000000000
--- a/misc/others/phpdoc-config.ini
+++ /dev/null
@@ -1,83 +0,0 @@
-[Parse Data]
-;; title of all the documentation
-;; legal values: any string
-title = Piwik Documentation
-
-;; parse files that start with a . like .bash_profile
-;; legal values: true, false
-hidden = false
-
-;; show elements marked @access private in documentation by setting this to on
-;; legal values: on, off
-parseprivate = on
-
-;; parse with javadoc-like description (first sentence is always the short description)
-;; legal values: on, off
-javadocdesc = off
-
-;; add any custom @tags separated by commas here
-;; legal values: any legal tagname separated by commas.
-;customtags = mytag1,mytag2
-
-;; This is only used by the XML:DocBook/peardoc2 converter
-defaultcategoryname = Documentation
-
-;; what is the main package?
-;; legal values: alphanumeric string plus - and _
-defaultpackagename = Piwik
-
-;; output any parsing information?  set to on for cron jobs
-;; legal values: on
-;quiet = on
-
-;; parse a PEAR-style repository.  Do not turn this on if your project does
-;; not have a parent directory named "pear"
-;; legal values: on/off
-;pear = on
-
-;; where should the documentation be written?
-;; legal values: a legal path
-;target = /home/cellog/output
-target = documentation
-
-;; Which files should be parsed out as special documentation files, such as README,
-;; INSTALL and CHANGELOG?  This overrides the default files found in
-;; phpDocumentor.ini (this file is not a user .ini file, but the global file)
-readmeinstallchangelog = README, INSTALL, FAQ, LICENSE
-
-;; limit output to the specified packages, even if others are parsed
-;; legal values: package names separated by commas
-;packageoutput = package1,package2
-
-;; comma-separated list of files to parse
-;; legal values: paths separated by commas
-;filename = /path/to/file1,/path/to/file2,fileincurrentdirectory
-
-;; comma-separated list of directories to parse
-;; legal values: directory paths separated by commas
-directory = core,plugins,libs/PiwikTracker
-
-;; template base directory (the equivalent directory of <installdir>/phpDocumentor)
-;templatebase = /path/to/my/templates
-
-;; directory to find any example files in through @example and {@example} tags
-;examplesdir = /path/to/my/templates
-
-;; comma-separated list of files, directories or wildcards ? and * (any wildcard) to ignore
-;; legal values: any wildcard strings separated by commas
-;ignore = /path/to/ignore*,*list.php,myfile.php,subdirectory/
-ignore = pear-*,Documentation/,tests/,*.test.php,Lexer.inc,*.tpl,*.js,*.css,*.txt,*.png,*.gif,*.jpg,*.ico,*.swf,LICENSE,README,Updates/,PhpSecInfo/,.git/,config/
-
-;; comma-separated list of Converters to use in outputformat:Convertername:templatedirectory format
-;; legal values: HTML:frames:default,HTML:frames:l0l33t,HTML:frames:phpdoc.de,HTML:frames:phphtmllib,
-;;               HTML:frames:earthli,
-;;               HTML:frames:DOM/default,HTML:frames:DOM/l0l33t,HTML:frames:DOM/phpdoc.de,
-;;               HTML:frames:DOM/phphtmllib,HTML:frames:DOM/earthli
-;;               HTML:Smarty:default,HTML:Smarty:PHP,HTML:Smarty:HandS
-;;               PDF:default:default,CHM:default:default,XML:DocBook/peardoc2:default
-output=HTML:frames:earthli
-;output=HTML:Smarty:HandS
-
-;; turn this option on if you want highlighted source code for every file
-;; legal values: on/off
-sourcecode = off
diff --git a/plugins/CoreUpdater/Commands/Update.php b/plugins/CoreUpdater/Commands/Update.php
new file mode 100644
index 0000000000000000000000000000000000000000..226117df1ef5987897bafb3841c66c469a41cbf1
--- /dev/null
+++ b/plugins/CoreUpdater/Commands/Update.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Piwik - Open source web analytics
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\CoreUpdater\Commands;
+
+use Piwik\Plugin\ConsoleCommand;
+use Piwik\Plugins\CoreUpdater\Controller;
+use Piwik\Plugins\CoreUpdater\NoUpdatesFoundException;
+use Piwik\Plugins\UserCountry\LocationProvider;
+use Symfony\Component\Console\Input\ArrayInput;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputDefinition;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
+
+/**
+ * @package CloudAdmin
+ */
+class Update extends ConsoleCommand
+{
+    protected function configure()
+    {
+        $this->setName('core:update');
+        $this->setDescription('Triggers the upgrades for Piwik core and plugins. Useful after Piwik core files or some plugins were updated to latest files.');
+
+        $this->addOption('dry-run', null, InputOption::VALUE_NONE, 'Only prints out the SQL requests that would be executed during the upgrade');
+    }
+
+    /**
+     * Execute command like: ./console core:update --dry-run
+     */
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        $doDryRun = $input->getOption('dry-run');
+
+        try {
+            $this->makeUpdate($input, $output, $doDryRun);
+        } catch(NoUpdatesFoundException $e) {
+            // Do not fail if no updates were found
+            $output->writeln("<info>".$e->getMessage()."</info>");
+        } catch (\Exception $e) {
+            // Fail in case of any other error during upgrade
+            $output->writeln("<error>" . $e->getMessage() . "</error>");
+            throw $e;
+        }
+    }
+
+    protected function makeUpdate(InputInterface $input, OutputInterface $output, $doDryRun)
+    {
+        $this->checkAllRequiredOptionsAreNotEmpty($input);
+
+        $updateController = new Controller();
+        echo $updateController->runUpdaterAndExit($doDryRun);
+    }
+}
\ No newline at end of file
diff --git a/plugins/CoreUpdater/Controller.php b/plugins/CoreUpdater/Controller.php
index ab578bad5c308c42e1020415ee39a309e02797ad..f9369896fbbf7927754780138bbbd31a9fd380a5 100644
--- a/plugins/CoreUpdater/Controller.php
+++ b/plugins/CoreUpdater/Controller.php
@@ -13,6 +13,7 @@ use Piwik\API\Request;
 use Piwik\ArchiveProcessor\Rules;
 use Piwik\Common;
 use Piwik\Config;
+use Piwik\DataTable\Renderer\Console;
 use Piwik\DbHelper;
 use Piwik\Filechecks;
 use Piwik\Filesystem;
@@ -265,15 +266,19 @@ class Controller extends \Piwik\Plugin\Controller
             LanguagesManager::setLanguageForSession($language);
         }
 
-        return $this->runUpdaterAndExit();
+        try {
+            return $this->runUpdaterAndExit();
+        } catch(NoUpdatesFoundException $e) {
+            Piwik::redirectToModule('CoreHome');
+        }
     }
 
-    protected function runUpdaterAndExit()
+    public function runUpdaterAndExit($doDryRun = null)
     {
         $updater = new Updater();
         $componentsWithUpdateFile = CoreUpdater::getComponentUpdates($updater);
         if (empty($componentsWithUpdateFile)) {
-            Piwik::redirectToModule('CoreHome');
+            throw new NoUpdatesFoundException("Everything is already up to date.");
         }
 
         SettingsServer::setMaxExecutionTime(0);
@@ -283,33 +288,44 @@ class Controller extends \Piwik\Plugin\Controller
         $doneTemplate = '@CoreUpdater/runUpdaterAndExit_done' . $cli;
         $viewWelcome = new View($welcomeTemplate);
         $viewDone = new View($doneTemplate);
+        $doExecuteUpdates = Common::getRequestVar('updateCorePlugins', 0, 'integer') == 1;
+
+        if(is_null($doDryRun)) {
+            $doDryRun = !$doExecuteUpdates;
+        }
+
+        if($doDryRun) {
+            $viewWelcome->queries = $updater->getSqlQueriesToExecute();
+            $viewWelcome->isMajor = $updater->hasMajorDbUpdate();
+            $this->doWelcomeUpdates($viewWelcome, $componentsWithUpdateFile);
+            return $viewWelcome->render();
+        }
 
+        // CLI
         if (Common::isPhpCliMode()) {
             $this->doWelcomeUpdates($viewWelcome, $componentsWithUpdateFile);
             $output = $viewWelcome->render();
 
-            if (!$this->coreError && Piwik::getModule() == 'CoreUpdater') {
+            // Proceed with upgrade in CLI only if user specifically asked for it, or if running console command
+            $isUpdateRequested = Common::isRunningConsoleCommand() || Piwik::getModule() == 'CoreUpdater';
+
+            if (!$this->coreError && $isUpdateRequested) {
                 $this->doExecuteUpdates($viewDone, $updater, $componentsWithUpdateFile);
                 $output .= $viewDone->render();
             }
-
             return $output;
+        }
 
-        } else {
-            if (Common::getRequestVar('updateCorePlugins', 0, 'integer') == 1) {
-                $this->warningMessages = array();
-                $this->doExecuteUpdates($viewDone, $updater, $componentsWithUpdateFile);
+        // Web
+        if ($doExecuteUpdates) {
+            $this->warningMessages = array();
+            $this->doExecuteUpdates($viewDone, $updater, $componentsWithUpdateFile);
 
-                $this->redirectToDashboardWhenNoError($updater);
+            $this->redirectToDashboardWhenNoError($updater);
 
-                return $viewDone->render();
-            } else {
-                $viewWelcome->queries = $updater->getSqlQueriesToExecute();
-                $viewWelcome->isMajor = $updater->hasMajorDbUpdate();
-                $this->doWelcomeUpdates($viewWelcome, $componentsWithUpdateFile);
-                return $viewWelcome->render();
-            }
+            return $viewDone->render();
         }
+
         exit;
     }
 
diff --git a/plugins/CoreUpdater/CoreUpdater.php b/plugins/CoreUpdater/CoreUpdater.php
index 4593c42a06cd1471b34baf5bee054e6550cda796..8cde10a7bcb546518ccc4fb15bde15ac40a6a915 100644
--- a/plugins/CoreUpdater/CoreUpdater.php
+++ b/plugins/CoreUpdater/CoreUpdater.php
@@ -32,10 +32,16 @@ class CoreUpdater extends \Piwik\Plugin
         $hooks = array(
             'Request.dispatchCoreAndPluginUpdatesScreen' => 'dispatch',
             'Updater.checkForUpdates'                    => 'updateCheck',
+            'Console.addCommands'                        => 'addConsoleCommands',
         );
         return $hooks;
     }
 
+    public function addConsoleCommands(&$commands)
+    {
+        $commands[] = 'Piwik\Plugins\CoreUpdater\Commands\Update';
+    }
+
     public static function updateComponents(Updater $updater, $componentsWithUpdateFile)
     {
         $warnings = array();
diff --git a/plugins/CoreUpdater/NoUpdatesFoundException.php b/plugins/CoreUpdater/NoUpdatesFoundException.php
new file mode 100644
index 0000000000000000000000000000000000000000..1fd3ef116047ae5b430a245d7d29dadbfb35c685
--- /dev/null
+++ b/plugins/CoreUpdater/NoUpdatesFoundException.php
@@ -0,0 +1,13 @@
+<?php
+/**
+ * Piwik - Open source web analytics
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\CoreUpdater;
+
+class NoUpdatesFoundException extends \Exception {
+
+}
\ No newline at end of file
diff --git a/plugins/CoreUpdater/templates/runUpdaterAndExit_done_cli.twig b/plugins/CoreUpdater/templates/runUpdaterAndExit_done_cli.twig
index 9d1a5ae357a17affc198bc3adf1af9afa3624e50..3f6f2cd6f399c9c5f891e98368f859e5a6879e02 100644
--- a/plugins/CoreUpdater/templates/runUpdaterAndExit_done_cli.twig
+++ b/plugins/CoreUpdater/templates/runUpdaterAndExit_done_cli.twig
@@ -47,7 +47,7 @@
 
     * {{ helpMessage }}
 {% else %}
-    {{ 'CoreUpdater_PiwikHasBeenSuccessfullyUpgraded'|translate }}
+*** {{ 'CoreUpdater_PiwikHasBeenSuccessfullyUpgraded'|translate }} ***
 {% endif %}
 
 {% endif %}
diff --git a/plugins/CoreUpdater/templates/runUpdaterAndExit_welcome_cli.twig b/plugins/CoreUpdater/templates/runUpdaterAndExit_welcome_cli.twig
index 7ab452913e542b55e041f0ee4f3977cf7dea89ba..b9126329719ebf773ec456698db8ceb75d70527f 100644
--- a/plugins/CoreUpdater/templates/runUpdaterAndExit_welcome_cli.twig
+++ b/plugins/CoreUpdater/templates/runUpdaterAndExit_welcome_cli.twig
@@ -22,16 +22,27 @@
 
     {{ 'CoreUpdater_YourDatabaseIsOutOfDate'|translate }}
 
-    {% if coreToUpdate %}
-        {{ 'CoreUpdater_PiwikWillBeUpgradedFromVersionXToVersionY'|translate(current_piwik_version, new_piwik_version) }}
-    {% endif %}
+{% if coreToUpdate %}
+    {{ 'CoreUpdater_PiwikWillBeUpgradedFromVersionXToVersionY'|translate(current_piwik_version, new_piwik_version) }}
+{% endif %}
 
-    {% if pluginNamesToUpdate|length > 0 %}
-        {%- set listOfPlugins %}{{  pluginNamesToUpdate|implode(', ') }}{% endset %}
-        {{ 'CoreUpdater_TheFollowingPluginsWillBeUpgradedX'|translate( listOfPlugins) }}
-    {%  endif %}
+{%- if pluginNamesToUpdate|length > 0 %}
+    {%- set listOfPlugins %}{{  pluginNamesToUpdate|implode(', ') }}{% endset %}
+    {{ 'CoreUpdater_TheFollowingPluginsWillBeUpgradedX'|translate( listOfPlugins) }}
+{%  endif %}
+
+{# dry run #}
+{% if queries is defined and queries is not empty %}
+*** Note: this is a Dry Run ***
 
+    {% for query in queries %}{{ query|trim }}
+    {% endfor %}
+
+*** End of Dry Run ***
+{% else %}
     {{ 'CoreUpdater_TheUpgradeProcessMayTakeAWhilePleaseBePatient'|translate }}
+{% endif %}
+
 {%  endif %}
 {% endautoescape %}
 
diff --git a/plugins/DevicesDetection/UserAgentParserEnhanced/UserAgentParserEnhanced.php b/plugins/DevicesDetection/UserAgentParserEnhanced/UserAgentParserEnhanced.php
index 3da3dec1f3e3c656dd022e4621ce76d710e20012..32aff13d471da02b91c782e8bc04c14389139747 100644
--- a/plugins/DevicesDetection/UserAgentParserEnhanced/UserAgentParserEnhanced.php
+++ b/plugins/DevicesDetection/UserAgentParserEnhanced/UserAgentParserEnhanced.php
@@ -222,6 +222,7 @@ class UserAgentParserEnhanced
         'Puppy'                => 'PPY',
         'Red Hat'              => 'RHT',
         'RISC OS'              => 'ROS',
+        'Sabayon'              => 'SAB',
         'SUSE'                 => 'SSE',
         'Sailfish OS'          => 'SAF',
         'Slackware'            => 'SLW',
@@ -276,7 +277,7 @@ class UserAgentParserEnhanced
         'IBM'                   => array('OS2'),
         'iOS'                   => array('IOS'),
         'RISC OS'               => array('ROS'),
-        'Linux'                 => array('LIN', 'ARL', 'DEB', 'KNO', 'MIN', 'UBT', 'KBT', 'XBT', 'LBT', 'FED', 'RHT', 'MDR', 'GNT', 'SLW', 'SSE', 'PPY', 'CES', 'BTR', 'YNS', 'PRS', 'SAF'),
+        'Linux'                 => array('LIN', 'ARL', 'DEB', 'KNO', 'MIN', 'UBT', 'KBT', 'XBT', 'LBT', 'FED', 'RHT', 'MDR', 'GNT', 'SAB', 'SLW', 'SSE', 'PPY', 'CES', 'BTR', 'YNS', 'PRS', 'SAF'),
         'Mac'                   => array('MAC'),
         'Mobile Gaming Console' => array('PSP', 'NDS', 'XBX'),
         'Other Mobile'          => array('WOS', 'POS', 'QNX', 'SBA', 'TIZ', 'SMG'),
diff --git a/plugins/DevicesDetection/UserAgentParserEnhanced/regexes/oss.yml b/plugins/DevicesDetection/UserAgentParserEnhanced/regexes/oss.yml
index b76b32761e4298ec2fba14695cd1e42fd5c6e02a..7db95595a341c4bcf9bd9b651eaecef143252531 100644
--- a/plugins/DevicesDetection/UserAgentParserEnhanced/regexes/oss.yml
+++ b/plugins/DevicesDetection/UserAgentParserEnhanced/regexes/oss.yml
@@ -72,14 +72,19 @@
 ##########
 # Linux
 ##########
-- regex: 'Linux; .*((?:Arch Linux|Debian|Knoppix|Mint|Ubuntu|Kubuntu|Xubuntu|Lubuntu|Fedora|Red Hat|Mandriva|Gentoo|Slackware|SUSE|Puppy|CentOS|BackTrack|YunOs|Presto))[ /](\d+\.\d+)'
+- regex: 'Linux; .*((?:Arch Linux|Debian|Knoppix|Mint|Ubuntu|Kubuntu|Xubuntu|Lubuntu|Fedora|Red Hat|Mandriva|Gentoo|Sabayon|Slackware|SUSE|Puppy|CentOS|BackTrack|YunOs|Presto))[ /](\d+\.\d+)'
   name: '$1'
   version: '$2'
   
   
-- regex: '(Arch Linux|Debian|Knoppix|Mint|Ubuntu|Kubuntu|Xubuntu|Lubuntu|Fedora|Red Hat|Mandriva|Gentoo|Slackware|SUSE|Puppy|CentOS|BackTrack|YunOs)(?: Linux)?(?:[ /\-](\d+\.\d+))?'
+- regex: '(Arch Linux|Debian|Knoppix|Mint|Ubuntu|Kubuntu|Xubuntu|Lubuntu|Fedora|Red Hat|Mandriva|Gentoo|Sabayon|Slackware|SUSE|Puppy|CentOS|BackTrack|YunOs)(?: Linux)?(?:[ /\-](\d+\.\d+))?'
   name: '$1'
   version: '$2'
+
+
+- regex: 'ArchLinux(?:[ /\-](\d+\.\d+))?'
+  name: 'Arch Linux'
+  version: '$1'
   
 # generic linux match -> end of file
 
diff --git a/plugins/DevicesDetection/lang/bg.json b/plugins/DevicesDetection/lang/bg.json
index c59cabef5112fc14733bea2a80b507ddef0f7493..cbd37620f3af88273d926000d82ac5474d26e457 100644
--- a/plugins/DevicesDetection/lang/bg.json
+++ b/plugins/DevicesDetection/lang/bg.json
@@ -1,6 +1,7 @@
 {
     "DevicesDetection": {
         "BrowserVersions": "Версии на браузъра",
+        "Camera": "Камера",
         "CarBrowser": "Браузър, който се използва в кола",
         "Console": "Конзола",
         "dataTableLabelBrands": "Марка",
@@ -17,6 +18,7 @@
         "OperatingSystemFamilies": "Вид операционна система",
         "OperatingSystemVersions": "Версия на операционната система",
         "PluginDescription": "Тази добавка предоставя допълнителна информация относно мобилните устройства: марка (производител), модел (версия на устройството), подобрен механизъм за установяване на типа устройство (телевизор, конзола, смартфон, компютър и др.) и т.н. Тази добавка добавя нов отчет „Посетители > Устройства“.",
+        "SmartDisplay": "„Умен“ дисплей",
         "Smartphone": "Смартфон",
         "submenu": "Устройства",
         "Tablet": "Таблет",
diff --git a/plugins/DevicesDetection/lang/fr.json b/plugins/DevicesDetection/lang/fr.json
index 42c740ab3dd95822bb427cc85cc591c9353882f2..b2b10a5b28cf37d7842a12aad08a7b7add74622a 100644
--- a/plugins/DevicesDetection/lang/fr.json
+++ b/plugins/DevicesDetection/lang/fr.json
@@ -1,6 +1,7 @@
 {
     "DevicesDetection": {
         "BrowserVersions": "Versions du Navigateur",
+        "Camera": "Camera",
         "CarBrowser": "Navigateur de voiture",
         "Console": "Console",
         "dataTableLabelBrands": "Marque",
diff --git a/plugins/DevicesDetection/lang/sv.json b/plugins/DevicesDetection/lang/sv.json
index 9378856f767e265ca3763b77dcd1023ad6a5e8c7..6df310dab17b1e5472402889ac83aa2013cd93bf 100644
--- a/plugins/DevicesDetection/lang/sv.json
+++ b/plugins/DevicesDetection/lang/sv.json
@@ -1,9 +1,11 @@
 {
     "DevicesDetection": {
         "BrowserVersions": "Version av webbläsare",
+        "Camera": "Kamera",
         "dataTableLabelBrands": "Märke",
         "dataTableLabelModels": "Modell",
         "dataTableLabelTypes": "Sort",
+        "Device": "Enhet",
         "DeviceBrand": "Typ av utrustning",
         "DevicesDetection": "Besöksutrustning",
         "FeaturePhone": "Telefonmodell",
diff --git a/plugins/Installation/Controller.php b/plugins/Installation/Controller.php
index 47b244dfa811a14820a8718d54f9a241ee9f72f1..85dc80d3f70533ef84d9bf4826c10f84d922c56d 100644
--- a/plugins/Installation/Controller.php
+++ b/plugins/Installation/Controller.php
@@ -756,24 +756,25 @@ class Controller extends \Piwik\Plugin\ControllerAdmin
 
         $infos['general_infos'] = array();
 
-        $directoriesToCheck = array();
+
+
+        $directoriesToCheck = array(
+                                '/tmp/',
+                                '/tmp/assets/',
+                                '/tmp/cache/',
+                                '/tmp/climulti/',
+                                '/tmp/latest/',
+                                '/tmp/logs/',
+                                '/tmp/sessions/',
+                                '/tmp/tcpdf/',
+                                '/tmp/templates_c/',
+        );
 
         if (!DbHelper::isInstalled()) {
             // at install, need /config to be writable (so we can create config.ini.php)
             $directoriesToCheck[] = '/config/';
         }
 
-        $directoriesToCheck = array_merge($directoriesToCheck, array(
-                                                                    '/tmp/',
-                                                                    '/tmp/assets/',
-                                                                    '/tmp/cache/',
-                                                                    '/tmp/latest/',
-                                                                    '/tmp/logs/',
-                                                                    '/tmp/sessions/',
-                                                                    '/tmp/tcpdf/',
-                                                                    '/tmp/templates_c/',
-                                                               ));
-
         $infos['directories'] = Filechecks::checkDirectoriesWritable($directoriesToCheck);
 
         $infos['can_auto_update'] = Filechecks::canAutoUpdate();
@@ -936,8 +937,7 @@ class Controller extends \Piwik\Plugin\ControllerAdmin
             $infos['has_errors'] = true;
         }
 
-        if (!$infos['can_auto_update']
-            || !empty($infos['missing_desired_extensions'])
+        if (   !empty($infos['missing_desired_extensions'])
             || !$infos['gd_ok']
             || !$infos['multibyte_ok']
             || !$infos['registerGlobals_ok']
diff --git a/plugins/PrivacyManager/Config.php b/plugins/PrivacyManager/Config.php
index 3e5c0d51566319f7f9ff909196e37c3223916a07..4a5848cd60357ad78473439ca12cfca5a275d7a5 100644
--- a/plugins/PrivacyManager/Config.php
+++ b/plugins/PrivacyManager/Config.php
@@ -29,7 +29,7 @@ class Config
     private $properties = array(
         'useAnonymizedIpForVisitEnrichment' => array('type' => 'boolean', 'default' => true),
         'ipAddressMaskLength'               => array('type' => 'integer', 'default' => 1),
-        'doNotTrackEnabled'                 => array('type' => 'boolean', 'default' => false),
+        'doNotTrackEnabled'                 => array('type' => 'boolean', 'default' => true),
         'ipAnonymizerEnabled'               => array('type' => 'boolean', 'default' => false),
     );
 
diff --git a/tests/PHPUnit/Core/ReleaseCheckListTest.php b/tests/PHPUnit/Core/ReleaseCheckListTest.php
index 86166fa1e16ad90bfe53afae116a545b7431f98e..85ffbef354a7681dc9e7c7e52d7e5d04d56ddcbf 100644
--- a/tests/PHPUnit/Core/ReleaseCheckListTest.php
+++ b/tests/PHPUnit/Core/ReleaseCheckListTest.php
@@ -1,5 +1,6 @@
 <?php
 use Piwik\Filesystem;
+use Piwik\Plugin\Manager;
 use Piwik\SettingsServer;
 
 /**
@@ -192,7 +193,7 @@ class ReleaseCheckListTest extends PHPUnit_Framework_TestCase
             $manager = \Piwik\Plugin\Manager::getInstance();
             $disabled = in_array($pluginName, $manager->getCorePluginsDisabledByDefault());
 
-            $isGitSubmodule = false !== strpos( file_get_contents(PIWIK_INCLUDE_PATH . '/.gitmodules'), "plugins/" . $pluginName);
+            $isGitSubmodule = Manager::getInstance()->isPluginOfficialAndNotBundledWithCore($pluginName);
             $enabled = in_array($pluginName, $pluginsBundledWithPiwik) || $isGitSubmodule || $pluginName == $manager::DEFAULT_THEME;
 
             $this->assertTrue( $enabled + $disabled === 1,
@@ -302,4 +303,6 @@ class ReleaseCheckListTest extends PHPUnit_Framework_TestCase
             $this->fail("$format format failed for following icons $icons \n");
         }
     }
+
+
 }
diff --git a/tests/PHPUnit/Fixture.php b/tests/PHPUnit/Fixture.php
index 03252556bd3a3364cd7a1907906a4c81d84a9e91..a5ecbeb1e195305b321b0bf5113c481734f1e7fb 100644
--- a/tests/PHPUnit/Fixture.php
+++ b/tests/PHPUnit/Fixture.php
@@ -209,8 +209,8 @@ class Fixture extends PHPUnit_Framework_Assert
 
     public static function loadAllPlugins()
     {
-        $plugins = \Piwik\Plugin\Manager::$pluginsToLoadForTests;
         $pluginsManager = \Piwik\Plugin\Manager::getInstance();
+        $plugins = $pluginsManager->getPluginsToLoadDuringTests();
 
         // Load all plugins
         $pluginsManager->loadPlugins($plugins);
diff --git a/tests/PHPUnit/Fixtures/userAgentParserEnhancedFixtures.yml b/tests/PHPUnit/Fixtures/userAgentParserEnhancedFixtures.yml
index 3655e1dba33550b3e8a01c32629a47e0d5c9bf16..6b2b1f0885f367c69cb20c90f725ca4b8bb542bf 100644
--- a/tests/PHPUnit/Fixtures/userAgentParserEnhancedFixtures.yml
+++ b/tests/PHPUnit/Fixtures/userAgentParserEnhancedFixtures.yml
@@ -18030,4 +18030,132 @@
     brand: 
     model: 
   os_family: Linux
-  browser_family: Unknown
\ No newline at end of file
+  browser_family: Unknown
+-
+  user_agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.13) Gecko/20101209 CentOS/3.6-2.el5.centos Firefox/3.6.13
+  os:
+    name: CentOS
+    short_name: CES
+    version: 3.6
+  browser:
+    name: Firefox
+    short_name: FF
+    version: 3.6
+  device:
+    type: desktop
+    brand: 
+    model: 
+  os_family: Linux
+  browser_family: Firefox
+-
+  user_agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.24) Gecko/20111101 SUSE/3.6.24-0.2.1 Firefox/3.6.24
+  os:
+    name: SUSE
+    short_name: SSE
+    version: 3.6
+  browser:
+    name: Firefox
+    short_name: FF
+    version: 3.6
+  device:
+    type: desktop
+    brand: 
+    model: 
+  os_family: Linux
+  browser_family: Firefox
+-
+  user_agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9a3pre) Gecko/20070301 Minefield/3.0a3pre
+  os:
+    name: Linux
+    short_name: LIN
+    version: 
+  browser:
+    name: Firefox
+    short_name: FF
+    version: Minefield (3.0)
+  device:
+    type: desktop
+    brand: 
+    model: 
+  os_family: Linux
+  browser_family: Firefox
+-
+  user_agent: Mozilla/5.0 (X11; U; Linux i686; fr-fr) AppleWebKit/531.2+ (KHTML, like Gecko) Version/5.0 Safari/531.2+ Debian/squeeze (2.30.6-1) Epiphany/2.30.6
+  os:
+    name: Debian
+    short_name: DEB
+    version: 
+  browser:
+    name: Epiphany
+    short_name: EP
+    version: 2.30
+  device:
+    type: desktop
+    brand: 
+    model: 
+  os_family: Linux
+  browser_family: Unknown
+-
+  user_agent: Mozilla/5.0 ArchLinux (X11; U; Linux x86_64; en-US) AppleWebKit/534.30 (KHTML, like Gecko) Chrome/12.0.742.100 Safari/534.30
+  os:
+    name: Arch Linux
+    short_name: ARL
+    version: 
+  browser:
+    name: Chrome
+    short_name: CH
+    version: 12.0
+  device:
+    type: desktop
+    brand: 
+    model: 
+  os_family: Linux
+  browser_family: Chrome
+-
+  user_agent: Opera/9.80 (X11; Linux x86_64; Sabayon) Presto/2.12.388 Version/12.16
+  os:
+    name: Sabayon
+    short_name: SAB
+    version: 
+  browser:
+    name: Opera
+    short_name: OP
+    version: 12.16
+  device:
+    type: desktop
+    brand: 
+    model: 
+  os_family: Linux
+  browser_family: Opera
+-
+  user_agent: UCWEB/2.0 (Linux; U; Opera Mini/7.1.32052/30.3697; en-US; LG-E405) U2/1.0.0 UCBrowser/8.8.1.359 Mobile
+  os:
+    name: Linux
+    short_name: LIN
+    version: 
+  browser:
+    name: Opera Mini
+    short_name: OI
+    version: 7.1
+  device:
+    type: smartphone
+    brand: LG
+    model: E405
+  os_family: Linux
+  browser_family: Opera
+-
+  user_agent: ZTE U930_TD/1.0 Linux/2.6.39 Android/4.0 Release/3.5.2012 Browser/AppleWebKit534.30
+  os:
+    name: Android
+    short_name: AND
+    version: 4.0
+  browser:
+    name: Android Browser
+    short_name: AN
+    version: 
+  device:
+    type: smartphone
+    brand: ZT
+    model: U930
+  os_family: Android
+  browser_family: Android Browser
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/Plugins/PrivacyManagerConfigTest.php b/tests/PHPUnit/Integration/Plugins/PrivacyManagerConfigTest.php
index c63f6b18f5434a551e0c60c8618b3c566f22c13c..cd0b9a9ecd0ab2691ddfa94988621d917ca7c65c 100644
--- a/tests/PHPUnit/Integration/Plugins/PrivacyManagerConfigTest.php
+++ b/tests/PHPUnit/Integration/Plugins/PrivacyManagerConfigTest.php
@@ -43,7 +43,7 @@ class Plugins_PrivacyManagerConfigTest extends DatabaseTestCase
 
     public function test_doNotTrackEnabled()
     {
-        $this->assertFalse($this->config->doNotTrackEnabled);
+        $this->assertTrue($this->config->doNotTrackEnabled);
 
         $this->config->doNotTrackEnabled = true;
 
@@ -80,7 +80,7 @@ class Plugins_PrivacyManagerConfigTest extends DatabaseTestCase
             'existingEntry' => 'test',
             'PrivacyManager.ipAddressMaskLength' => 1,
             'PrivacyManager.ipAnonymizerEnabled' => false,
-            'PrivacyManager.doNotTrackEnabled'   => false,
+            'PrivacyManager.doNotTrackEnabled'   => true,
             'PrivacyManager.useAnonymizedIpForVisitEnrichment' => true,
         );
 
diff --git a/tests/PHPUnit/IntegrationTestCase.php b/tests/PHPUnit/IntegrationTestCase.php
index 4c9e4daa0c5835a23a21ab663e1f8f754506e505..c1493c24a1f8fa030cd19df2cf424753097ab424 100755
--- a/tests/PHPUnit/IntegrationTestCase.php
+++ b/tests/PHPUnit/IntegrationTestCase.php
@@ -1003,4 +1003,4 @@ abstract class IntegrationTestCase extends PHPUnit_Framework_TestCase
         $response = $this->removeXmlElement($response, "xmpMM:InstanceID");
         return $response;
     }
-}
\ No newline at end of file
+}
diff --git a/tests/PHPUnit/TestingEnvironment.php b/tests/PHPUnit/TestingEnvironment.php
index 5dcfa1fa25a6f4d314c4d2e35baeb11478be469a..8d1b47fd3aedf0b4753a7511361fd5800b69ea8e 100644
--- a/tests/PHPUnit/TestingEnvironment.php
+++ b/tests/PHPUnit/TestingEnvironment.php
@@ -48,7 +48,7 @@ class Piwik_TestingEnvironment
 
             $config->setTestEnvironment();
 
-            $pluginsToLoad = \Piwik\Plugin\Manager::$pluginsToLoadForTests;
+            $pluginsToLoad = \Piwik\Plugin\Manager::getInstance()->getPluginsToLoadDuringTests();
             $config->Plugins = array('Plugins' => $pluginsToLoad);
 
             $trackerPluginsToLoad = array(
diff --git a/tests/PHPUnit/UI b/tests/PHPUnit/UI
index 4a235856531eb4642a7c8abe8bdf0f6e60fccac9..6525225d3ed617b1b5ff9f876799d1972904ee07 160000
--- a/tests/PHPUnit/UI
+++ b/tests/PHPUnit/UI
@@ -1 +1 @@
-Subproject commit 4a235856531eb4642a7c8abe8bdf0f6e60fccac9
+Subproject commit 6525225d3ed617b1b5ff9f876799d1972904ee07