diff --git a/core/Common.php b/core/Common.php
index af85425ed9ce0f76bed387092ab953805c6ac679..5e4584d033bb6c76d9f100ac6354be0939092699 100644
--- a/core/Common.php
+++ b/core/Common.php
@@ -964,9 +964,9 @@ class Common
             } else {
                 $list = array($list);
             }
+            $list = array_map('trim', $list);
         }
 
-        array_walk_recursive($return, 'trim');
         return $return;
     }
 
diff --git a/core/DataTable/Filter/Pattern.php b/core/DataTable/Filter/Pattern.php
index 6619fe4134c6f8e240933607a0bbf374819897c7..5ee42310a884663fafc22c51bbfbed9987e105ba 100644
--- a/core/DataTable/Filter/Pattern.php
+++ b/core/DataTable/Filter/Pattern.php
@@ -65,16 +65,15 @@ class Pattern extends BaseFilter
     /**
      * Performs case insensitive match
      *
-     * @param string $pattern
      * @param string $patternQuoted
      * @param string $string
      * @param bool $invertedMatch
      * @return int
      * @ignore
      */
-    static public function match($pattern, $patternQuoted, $string, $invertedMatch)
+    static public function match($patternQuoted, $string, $invertedMatch = false)
     {
-        return @preg_match($patternQuoted . "i", $string) == 1 ^ $invertedMatch;
+        return preg_match($patternQuoted . "i", $string) == 1 ^ $invertedMatch;
     }
 
     /**
@@ -93,7 +92,7 @@ class Pattern extends BaseFilter
             if ($value === false) {
                 $value = $row->getMetadata($this->columnToFilter);
             }
-            if (!self::match($this->patternToSearch, $this->patternToSearchQuoted, $value, $this->invertedMatch)) {
+            if (!self::match($this->patternToSearchQuoted, $value, $this->invertedMatch)) {
                 $table->deleteRow($key);
             }
         }
diff --git a/core/DataTable/Filter/PatternRecursive.php b/core/DataTable/Filter/PatternRecursive.php
index 1a82384d5e732c5c0732bb1c07d56ee955e15c7f..24e6f6b23094427b94130e2beba8cc0593306555 100644
--- a/core/DataTable/Filter/PatternRecursive.php
+++ b/core/DataTable/Filter/PatternRecursive.php
@@ -81,7 +81,7 @@ class PatternRecursive extends BaseFilter
             }
 
             if ($patternNotFoundInChildren
-                && !Pattern::match($this->patternToSearch, $this->patternToSearchQuoted, $row->getColumn($this->columnToFilter), $invertedMatch = false)
+                && !Pattern::match($this->patternToSearchQuoted, $row->getColumn($this->columnToFilter), $invertedMatch = false)
             ) {
                 $table->deleteRow($key);
             }
diff --git a/core/MetricsFormatter.php b/core/MetricsFormatter.php
index 5fd464ff8d2fa69956cd2c0e302b4892060b8f18..8f58e525887f66f8de87e93df10e1ef34784c4d5 100644
--- a/core/MetricsFormatter.php
+++ b/core/MetricsFormatter.php
@@ -56,6 +56,12 @@ class MetricsFormatter
     {
         $numberOfSeconds = $round ? (int)$numberOfSeconds : (float)$numberOfSeconds;
 
+        $isNegative = false;
+        if ($numberOfSeconds < 0) {
+            $numberOfSeconds = -1 * $numberOfSeconds;
+            $isNegative = true;
+        }
+
         // Display 01:45:17 time format
         if ($displayTimeAsSentence === false) {
             $hours = floor($numberOfSeconds / 3600);
@@ -66,9 +72,13 @@ class MetricsFormatter
             if ($centiSeconds) {
                 $time .= '.' . sprintf("%02s", $centiSeconds);
             }
+            if ($isNegative) {
+                $time = '-' . $time;
+            }
             return $time;
         }
         $secondsInYear = 86400 * 365.25;
+
         $years = floor($numberOfSeconds / $secondsInYear);
         $minusYears = $numberOfSeconds - $years * $secondsInYear;
         $days = floor($minusYears / 86400);
@@ -94,6 +104,11 @@ class MetricsFormatter
         } else {
             $return = sprintf(Piwik::translate('General_Seconds'), $seconds);
         }
+
+        if ($isNegative) {
+            $return = '-' . $return;
+        }
+
         if ($isHtml) {
             return str_replace(' ', '&nbsp;', $return);
         }
diff --git a/lang/bg.json b/lang/bg.json
index 4a9f87787ec0a72f5326d771d13fbf75cd685a1f..e63e27a4384dd02c38479a9c37c687429cfefc83 100644
--- a/lang/bg.json
+++ b/lang/bg.json
@@ -86,6 +86,7 @@
         "MoreInformation": "За повече информация за Piwik API-тата, моля погледнете %s Въведение в Piwik API%s и %s Piwik API Референт%s.",
         "PluginDescription": "Цялата информация от Piwik е достъпна чрез просто API. Тази добавка ви дава възможност да получите данни от Вашият Уеб Анализатор под формата на xml,json,php,cvs и др.",
         "QuickDocumentationTitle": "API бърза документация",
+        "TopLinkTooltip": "Информацията за уеб анализите може да бъде достъпена чрез прост приложно-програмен интерфейс в json, xml и др. формат.",
         "UserAuthentication": "Удостоверяване на потребителя",
         "UsingTokenAuth": "Ако искате да %s вмъкнете данните със скрипт, crontab, др. %s трябва да добавите параметър %s на API кода за повиквания на URL адреси, които изискват удостоверяване."
     },
@@ -113,6 +114,7 @@
         "JSTracking_CustomCampaignQueryParamDesc": "Забележка: %1$sPiwik автоматично ще засече Google Analytics параметрите.%2$s",
         "JSTracking_EnableDoNotTrack": "Активиране на режим за засичане на включена функция „Не проследявай“",
         "JSTracking_EnableDoNotTrackDesc": "Заявките за следене няма да бъдат изпратени, ако посетителите не желаят да бъде събирана информация за тях.",
+        "JSTracking_GroupPageTitlesByDomainDesc1": "В случай, че някой посети страница „За“ в блога, %1$s ще бъде записан\/о в 'Блог \/ За'. Това е най-лесният начин, за да се направи преглед на трафика по поддомейн.",
         "JSTracking_MergeAliases": "В доклада за „Изходните страници“ скрийте щракванията до познати адреси на",
         "JSTracking_MergeSubdomains": "Проследяване на посетителите във всички поддомейни на",
         "JSTracking_MergeSubdomainsDesc": "Ако един посетител разгледа %1$s и %2$s, това ще се брои като едно уникално посещение.",
@@ -234,6 +236,7 @@
         "CorePluginTooltip": "Основните добавки нямат версия, тъй като се разпространяват с Piwik.",
         "Deactivate": "Деактивирай",
         "Developer": "Разработчик",
+        "DoMoreContactPiwikAdmins": "За да се инсталира нова добавка или нова тема, трябва да се свържете с вашия администратор, който отговаря за Piwik.",
         "DownloadAndInstallPluginsFromMarketplace": "Можете автоматично да свалите и инсталирате нови добавки от %sмагазина за приложения%s.",
         "EnjoyAnotherLookAndFeelOfThemes": "Насладете се на друг изглед и усещане",
         "FeaturedPlugin": "Препоръчана добавка",
@@ -254,6 +257,7 @@
         "Marketplace": "Магазин",
         "MarketplaceSellPluginSubject": "Магазин – Продайте добавка",
         "MenuPlatform": "Платформа",
+        "MissingRequirementsNotice": "Моля, обновете %1$s %2$s до по-нова версия, %1$s %3$s се изисква.",
         "NoPluginsFound": "Не е намерена добавка",
         "NotAllowedToBrowseMarketplacePlugins": "Може да разгледате списъка с добавки, които могат да бъдат инсталирани, за да настроите или разширите вашата Piwik платформа. Моля, свържете се с вашия системен администратор, ако желаете да бъде инсталирана някоя добавка.",
         "NotAllowedToBrowseMarketplaceThemes": "Може да разгледате списъка с тапети, които могат да бъдат инсталирани, за да променят изгледа на Piwik. Моля, свържете се с вашия системен администратор, за да извърши инсталацията им.",
@@ -568,6 +572,7 @@
         "Done": "Готово",
         "Download": "Изтегли",
         "DownloadFail_FileExists": "Файлът %s вече съществува!",
+        "DownloadFail_FileExistsContinue": "Направен е опит да се продължи свалянето за %s, но изцяло изтеглен файл вече съществува!",
         "DownloadFail_HttpRequestFail": "Файлът не може да бъде свален! Възможно е да има проблем със сайта, от който се опитвате да сваляте. Може да се опитате по-късно отново да свалите файла или да го намерите от друго място.",
         "DownloadFullVersion": "%1$sИзтегли%2$s пълната версия! Проверка %3$s",
         "DownloadPleaseRemoveExisting": "В случай, че желаете да бъде сменен, трябва наличният файл да бъде премахнат.",
@@ -970,6 +975,7 @@
         "PluginDescription": "Генерирайте красиви статични PNG графични изображения за всеки Piwik доклад."
     },
     "Installation": {
+        "CollaborativeProject": "Piwik е съвместен проект, изграден с много любов от хора от всички краища на света.",
         "CommunityNewsletter": "изпращай по пощата информация за нови добавки, функции и др.",
         "ConfigurationHelp": "Вашият Piwik конфигурационен файл изглежда не добре конфигуриран. Можете да премахнете config\/config.ini.php и да започнете инсталирането, или да поправите настройките за връзка към БД-то.",
         "ConfirmDeleteExistingTables": "Наистина ли искате да изтриете следните таблици: %s от базата от данни (БД)? ПРЕДУПРЕЖДЕНИЕ: ДАННИТЕ ОТ ТАЗИ ТАБЛИЦА НЕ МОГАТ ДА БЪДАТ ВЪЗСТАНОВЕНИ!!!",
@@ -991,7 +997,9 @@
         "ErrorInvalidState": "Грешка: възможно е да сте опитали да прескочите стъпка от инсталацията или е забранена поддръжката на бисквитките (cookies) или конфигурационният файл на Piwik вече съществува. %1$sПроверете дали са разрешени бисквитките (cookies)%2$s и се върнете %3$s на първата страница на инсталацията%4$s.",
         "Extension": "разширения",
         "Filesystem": "Файлова система",
+        "GetInvolved": "Ако харесвате това, което виждате, може да се %1$sвключите%2$s.",
         "GoBackAndDefinePrefix": "Върнете се за да зададете Prefix за Piwik таблиците в базата от данни (БД)",
+        "HappyAnalysing": "Приятно анализиране!",
         "Installation": "Инсталация",
         "InstallationStatus": "Състояние на инсталацията",
         "InsufficientPrivilegesHelp": "Можете да добавите тези привилегии, като използвате инструмент, като например phpMyAdmin или като стартирате правилната SQL поръчка. Ако не знаете как се правят тези неща, попитайте вашият системен администратор да ви даде тези привилегии.",
@@ -1081,8 +1089,10 @@
         "TablesWarningHelp": "Изберете дали да обновите данните в съществуващите таблици или да инсталирате Piwik на чисто.",
         "TablesWithSameNamesFound": "Някои %1$s таблици в базата от данни (БД) %2$s имат същите имена, както тези, които Piwik се опитва да създаде",
         "Timezone": "Уеб сайт времева зона",
+        "WeHopeYouWillEnjoyPiwik": "Надяваме се, че ще се радвате на работата с Piwik толкова, колкото ние се радваме при разработването на Piwik.",
         "Welcome": "Добре дошли!",
-        "WelcomeHelp": "<p>Piwik е анализатор (уеб брояч) с отворен код, който гъвкаво и лесно предоставя информация за посетителите на сайта ви.<\/p><p>Този процес е съкратен в %s лесни стъпки и не отнема повече от 5 минути.<\/p>"
+        "WelcomeHelp": "<p>Piwik е анализатор (уеб брояч) с отворен код, който гъвкаво и лесно предоставя информация за посетителите на сайта ви.<\/p><p>Този процес е съкратен в %s лесни стъпки и не отнема повече от 5 минути.<\/p>",
+        "WelcomeToCommunity": "Добре дошли в Piwik общността!"
     },
     "LanguagesManager": {
         "AboutPiwikTranslations": "За Piwik преводите",
@@ -1847,6 +1857,8 @@
         "getRegionDocumentation": "Този отчет показва къде са се намирали вашите посетители, при достъпването на сайта.",
         "HowToInstallApacheModule": "Как да инсталирам GeoIP модул за Apache?",
         "HowToInstallGeoIPDatabases": "Как да взема GeoIP база данни?",
+        "HowToInstallGeoIpPecl": "Как се инсталира GeoIP PECL разширение?",
+        "HowToInstallNginxModule": "Как се инсталира GeoIP модул за Nginx?",
         "HowToSetupGeoIP_Step1": "%1$sСвалете%2$s GeoLite City базата данни от %3$sMaxMind%4$s.",
         "HowToSetupGeoIP_Step2": "Разархивирайте файла и копирайте резултата, %1$s в Piwik поддиректорията %2$sразни%3$s (можете да направите това посредством FTP или SSH).",
         "HowToSetupGeoIP_Step3": "Презареждане на този екран. Доставчикът на %1$sGeoIP (PHP)%2$s, ще бъде %3$sинсталиран%4$s. Избиране.",
@@ -1874,7 +1886,10 @@
         "ToGeolocateOldVisits": "За да получите информация за предишни посещения, използвайте скриптът описан %1$sтук%2$s.",
         "UnsupportedArchiveType": "Типът архив %1$s не се поддържа.",
         "UpdaterHasNotBeenRun": "Не е пускана до момента задача за обновяване.",
+        "UpdaterIsNotScheduledToRun": "Не е планирано да се изпълнява в бъдеще.",
+        "UpdaterScheduledForNextRun": "Ще бъде пуснато при следващото изпълнение на archive.php cron.",
         "UpdaterWasLastRun": "Задача за проверка за обновления е стартирана последно на %s.",
+        "UpdaterWillRunNext": "Следващото пускане е планирано за %s.",
         "WidgetLocation": "Местонахождение на посетителя"
     },
     "UserCountryMap": {
diff --git a/lang/el.json b/lang/el.json
index b2e1fde94b1ca8436a2fb7eda3fa299d0d61df57..19a5dd36dc28322a67c37348453d613cee25136e 100644
--- a/lang/el.json
+++ b/lang/el.json
@@ -155,7 +155,6 @@
         "PluginSettings": "Ρυθμίσεις πρόσθετου",
         "PluginSettingsIntro": "Εδώ μπορείτε να αλλάξετε τις ρυθμίσεις των παρακάτω πρόσθετων από τρίτους:",
         "PluginSettingsValueNotAllowed": "Η τιμή για το πεδίο \"%s\" στο πρόσθετο \"%s\" δεν είναι επιτρεπτή",
-        "ScheduledTasks": "Προγραμματισμένες Εργασίες",
         "StableReleases": "Αν το Piwik αποτελεί ένα κρίσιμο μέρος της επιχείρησής σας, προτείνουμε να χρησιμοποιείτε την τελευταία σταθερή έκδοση. Αν χρησιμοποιείτε την τελευταία δοκιμαστική έκδοση και βρείτε κάποιο σφάλμα ή έχετε κάποια πρόταση, παρακαλούμε %sδείτε εδώ%s.",
         "TrackAGoal": "Παρακολούθηση ενός στόχου",
         "TrackingCode": "Κώδικας παρακολούθησης",
diff --git a/lang/en.json b/lang/en.json
index de9ac9afd31cbbf423f9bfe854d7cd847f923949..fdd3900a6c2abe1acf3f523068eb571bbae20fb8 100644
--- a/lang/en.json
+++ b/lang/en.json
@@ -511,7 +511,6 @@
         "TopLinkTooltip": "Access your Web Analytics data programmatically through a simple API in json, xml, etc."
     },
     "CoreAdminHome": {
-        "ScheduledTasks": "Scheduled Tasks",
         "PluginDescription": "Administration area of Piwik.",
         "MenuDiagnostic": "Diagnostic",
         "MenuGeneralSettings": "General settings",
diff --git a/lang/et.json b/lang/et.json
index f5564d2eb7965c6421551a4da523142466fe6fa3..a60c465f173fe531cc1728ec2788bc996a10770a 100644
--- a/lang/et.json
+++ b/lang/et.json
@@ -19,7 +19,7 @@
         "ColumnUniqueDownloads": "Unikaalseid Allalaadimisi",
         "ColumnUniqueOutlinks": "Unikaalsed väljuvad lingid",
         "EntryPageTitles": "Sisenetud lehtede pealkirjad",
-        "ExitPageTitles": "Väljumiste lehe pealkirjad",
+        "ExitPageTitles": "Väljutud lehtede pealkirjad",
         "OneSearch": "1 otsing",
         "PageUrls": "Lehe URL'id",
         "SiteSearchKeyword": "Võtmesõna (lehe otsing)",
@@ -28,7 +28,7 @@
         "SubmenuPageTitles": "Lehe pealkirjad",
         "SubmenuSitesearch": "Lehe otsing",
         "WidgetEntryPageTitles": "Sisenetud lehtede pealkirjad",
-        "WidgetExitPageTitles": "Väljumiste lehe pealkirjad",
+        "WidgetExitPageTitles": "Väljutud lehtede pealkirjad",
         "WidgetPagesEntry": "Sisenetud lehed",
         "WidgetPagesExit": "Lehed kust väljutakse",
         "WidgetPageTitles": "Lehe pealkirjad",
@@ -66,7 +66,10 @@
         "MenuGeneralSettings": "Põhiseaded",
         "MenuManage": "Halda",
         "PiwikIsInstalledAt": "Piwik on paigaldatud",
-        "PluginSettings": "Lisatarkvara seaded"
+        "PluginSettings": "Lisatarkvara seaded",
+        "TrackingCode": "Jälgimiskood",
+        "TrustedHostSettings": "Usaldatud Piwiku server",
+        "ValidPiwikHostname": "Kehtiv Piwiku server (IP\/host)"
     },
     "CoreHome": {
         "CategoryNoData": "Informatsioon puudub selles kategoorias. Proovi \"Include all population\".",
@@ -186,6 +189,7 @@
         "TrackingHelp": "Abi: %1$sPiwiku kohandatud muutujate kasutamine%2$s"
     },
     "Dashboard": {
+        "AddAWidget": "Lisa vidin",
         "AddPreviewedWidget": "Vali et lisada vidin töölauale",
         "ChangeDashboardLayout": "Muuda töölaua paigutust",
         "CopyDashboardToUser": "Kopeeri töölaud kasutajale",
@@ -201,6 +205,7 @@
         "RenameDashboard": "Nimeta töölaud ümber",
         "ResetDashboard": "Algseadista töölaud",
         "SelectWidget": "Vali töölauale lisatav moodul",
+        "SetAsDefaultWidgets": "Määra vaikimisi valitud vidinateks",
         "WidgetNotFound": "Moodulit ei leitud",
         "WidgetPreview": "Vidina eelvaade",
         "WidgetsAndDashboard": "Vidinad ja töölaud"
@@ -223,7 +228,7 @@
     "General": {
         "AboutPiwikX": "Lisainfo Piwik %s",
         "Action": "Tegevus",
-        "Actions": "Tegevust",
+        "Actions": "Tegevused",
         "Add": "Lisa",
         "All": "Kõik",
         "AllWebsitesDashboard": "Kõigi veebilehtede töölaud",
@@ -249,6 +254,7 @@
         "ColumnAvgTimeOnSiteDocumentation": "Kesmine külastuse aeg.",
         "ColumnBounceRate": "Põrkemäär",
         "ColumnBounces": "Põrked",
+        "ColumnConversionRate": "Tulumäär",
         "ColumnDestinationPage": "Sihtkoha lehekülg",
         "ColumnEntrances": "Sisenemised",
         "ColumnExitRate": "Väljumiste määr",
@@ -261,12 +267,13 @@
         "ColumnNbUniqVisitors": "Unikaalsed külastajad",
         "ColumnNbVisits": "Külastused",
         "ColumnPageviews": "Lehevaatamised",
-        "ColumnPercentageVisits": "% Külastusi",
+        "ColumnPercentageVisits": "% Külastust",
         "ColumnRevenue": "Tulu",
         "ColumnTotalPageviews": "Lehe vaatamisi kokku",
         "ColumnUniqueEntrances": "Unikaalseid sisenemisi",
         "ColumnUniqueExits": "Unikaalseid väljumisi",
         "ColumnUniquePageviews": "Unikaalseid lehe vaatamisi",
+        "ColumnVisitsWithConversions": "Külastused tulu tekitamisega",
         "Continue": "Jätka",
         "ContinueToPiwik": "Jätka Piwikuga",
         "CurrentMonth": "Praegune kuu",
@@ -322,7 +329,7 @@
         "First": "Esimene",
         "ForExampleShort": "n.",
         "Forums": "Foorumid",
-        "FromReferrer": "tuli:",
+        "FromReferrer": "tuli",
         "GeneralInformation": "Ãœldine info",
         "GeneralSettings": "Ãœldised seaded",
         "GetStarted": "Alusta kasutamist",
@@ -336,7 +343,7 @@
         "Id": "Id",
         "Installed": "Paigaldatud",
         "IP": "IP",
-        "JsTrackingTag": "Javascript tag",
+        "JsTrackingTag": "JavaScript jälgimiskood",
         "Language": "Keel",
         "LastDays": "Viimased %s päeva (sh. täna)",
         "LastDaysShort": "Viimased %s päeva",
@@ -367,6 +374,7 @@
         "LongMonth_7": "juuli",
         "LongMonth_8": "august",
         "LongMonth_9": "september",
+        "MainMetrics": "Põhimõõdikud",
         "Matches": "Vastavused",
         "Metadata": "Metaandmed",
         "MinutesSeconds": "%1$s min %2$ss",
@@ -488,6 +496,7 @@
         "Today": "täna",
         "Total": "Kokku",
         "TotalRevenue": "Kogutulu",
+        "TotalVisitsPageviewsRevenue": "(Kokku: %s külastust, %s lehe vaatamist, %s tulu)",
         "TransitionsRowActionTooltip": "Vaata mida külastajad tegid enne ja peale selle lehe vaatamist",
         "TransitionsRowActionTooltipTitle": "Ava üleminekud",
         "TranslatorEmail": "aivo.koger@gmail.com, toomingas.k@gmail.com",
@@ -501,11 +510,15 @@
         "View": "Vaata",
         "ViewDocumentationFor": "Vaata %1$s dokumentatsiooni",
         "Visit": "Külastus",
+        "VisitConvertedGoal": "Külastusega täideti vähemalt 1 eesmärk",
+        "VisitConvertedGoalId": "Külastus tõi tulu spetsiifilise eesmärgi ID'ga",
+        "VisitConvertedNGoals": "Külastusega täideti %s eesmärki",
         "VisitDuration": "Keskmine külastuse kestvus (sek)",
         "Visitor": "Külastaja",
         "VisitorID": "Külastaja ID",
         "VisitorIP": "Külastaja IP",
         "Visitors": "Külastajad",
+        "VisitsWith": "Külastused koos %s",
         "VisitType": "Külalise tüüp",
         "Warning": "Hoiatus",
         "Website": "Veebileht",
@@ -515,7 +528,7 @@
         "WellDone": "Hästi tehtud!",
         "Widgets": "Moodulid",
         "XComparedToY": "%1$s võrreldes %2$s",
-        "XFromY": "%1$s kuni %2$s",
+        "XFromY": "%1$s tuli: %2$s",
         "YearlyReport": "iga-aastane",
         "YearlyReports": "Iga-aastased raportid",
         "YearsDays": "%1$s aastat %2$s päeva",
@@ -530,24 +543,50 @@
     "Goals": {
         "AddGoal": "Lisa eesmärk",
         "AddNewGoal": "Lisa uus eesmärk",
+        "AllowGoalConvertedMoreThanOncePerVisit": "Luba külastajate muundamist rohkem kui ühe korra külastuse jooksul (võib mitu korda muutuda tulu toovaks kliendiks)",
+        "AllowMultipleConversionsPerVisit": "Luba mitu tulutoomist ühe külastuse jooksul",
+        "CaseSensitive": "Tähtede tõusutundlik võrdlus",
+        "ClickOutlink": "Klikivad välise lehe lingile",
+        "ColumnConversions": "Tulu tekitamised",
         "Contains": "sisaldab %s",
+        "ConversionRate": "%s tulumäär",
+        "Conversions": "%s tulu tekitamist",
+        "ConversionsOverview": "Tulu tekitamiste ülevaade",
+        "DaysToConv": "Päevi tulu tekitamiseni",
+        "DefaultGoalConvertedOncePerVisit": "(vaikimisi) Eesmärgi jaoks saab klienti muudada ainult ühe korra külastuse jooksul (hetk kui külastajast saab tulutoov klient)",
+        "DefaultRevenue": "Eesmärgi vaikimisi kasum on",
+        "Download": "Laevad alla faili",
         "ExternalWebsiteUrl": "välise veebilehe URL",
         "Filename": "failinimi",
+        "GoalConversion": "Eesmärgi tulu",
+        "GoalConversions": "Eesmärgi tulud",
+        "GoalIsTriggered": "Eesmärk käivitub",
+        "GoalIsTriggeredWhen": "Eesmärk käivitub kui",
         "GoalName": "Eesmärgi nimi",
         "Goals": "Eesmärgid",
         "GoalsManagement": "Eesmärkide haldus",
         "GoalsOverview": "Eesmärkide ülevaade",
         "GoalX": "Eesmärk %s",
+        "IsExactly": "on täpselt %s",
         "Manually": "manuaalselt",
+        "MatchesExpression": "vastab reeglile %s",
+        "Optional": "(valikuline)",
         "PageTitle": "Lehe pealkiri",
-        "URL": "URL"
+        "URL": "URL",
+        "VisitPageTitle": "Külastavad määratud pealkirjaga lehte",
+        "VisitsUntilConv": "Külastusi tulu tekitamiseni",
+        "VisitUrl": "Külastavad määratud URLi (leht või lehtede grupp)",
+        "WhenVisitors": "kui külastajad",
+        "WhereThe": "kus"
     },
     "Installation": {
         "Congratulations": "Õnnitleme",
         "CongratulationsHelp": "<p>Õnnitlused! Sinu Piwiki Installatsioon on edukalt lõpuni viidud.<\/p><p>Sisesta javascript kood oma lehele ja jää külastusi ootama!<\/p>",
+        "Email": "e-post",
         "Installation": "Installatsioon",
         "InstallationStatus": "Installatiooni olek",
         "NoConfigFound": "Piwiki konfguratsioonifaili ei leitud, kuid sa üritasid minna Piwiki lehele.<br \/><b>  » Võid <a href='index.php'>installeerida Piwiko<\/a><\/b><br \/><small>Kui Piwik on varem installeeritud ja sul on andmebaasis tabeleid, siis ei ole põhjust muretsemiseks saad taaskasutada ja säilitada olemasolevad andmed!<\/small>",
+        "Optional": "Valikuline",
         "PercentDone": "%s %% Tehtud",
         "SetupWebsite": "Seadista veebileht",
         "SetupWebsiteError": "Veebilehe lisamisel tekkis viga",
@@ -574,6 +613,7 @@
         "WelcomeHelp": "<p>Piwik on vabavaraline veebianalüüika tarkvara, mis teeb lihtsaks oma külastajate kohta andmete kogumise ja nende analüüsimise.<\/p><p>See protsess sisaldab %s sammu ja võtab aega u. 5 minutit.<\/p>"
     },
     "Live": {
+        "ConvertedNGoals": "Muutus tulutoovaks %s korral",
         "FirstVisit": "Esmane külastus",
         "GoalType": "Tüüp",
         "HideMap": "peida kaart",
@@ -595,7 +635,9 @@
         "VisitedPages": "Külastatud lehed",
         "VisitorLog": "Külastuste logi",
         "VisitorProfile": "Külastaja profiil",
-        "VisitorsInRealTime": "Reaalajas külastused"
+        "VisitorsInRealTime": "Reaalajas külastused",
+        "VisitsFrom": "%1$s%2$s külastust %3$s pärineb",
+        "VisitSummary": "Viibis veebilehel kokku %1$s%2$s ja %3$s, and %4$svaatas %5$s lehte %6$s külastuse jooksul.%7$s"
     },
     "Login": {
         "ContactAdmin": "Võimalik põhjus: sinu majutusel on mail() funktsioon välja lülitatud. <br \/>Palun kontakteeru administraatoriga.",
@@ -612,6 +654,10 @@
         "SearchWebsite": "Otsi veebilehti",
         "TopVisitedWebsites": "Peamised külastatud veebilehed"
     },
+    "MobileMessaging": {
+        "Settings_SuperAdmin": "Superkasutaja seaded",
+        "SettingsMenu": "Mobiilsed teenused"
+    },
     "Overlay": {
         "Clicks": "%s klikki",
         "Domain": "Domeen",
@@ -620,6 +666,11 @@
         "OneClick": "1 klikk",
         "OpenFullScreen": "Ava täisekraani vaade (ilma külgribata)"
     },
+    "PrivacyManager": {
+        "MenuPrivacySettings": "Privaatsus",
+        "RecommendedForPrivacy": "(soovitatav privaatsuse jaoks)",
+        "TeaserHeadline": "Privaatsusseaded"
+    },
     "Provider": {
         "ColumnProvider": "Teenusepakkuja",
         "SubmenuLocationsProvider": "Asukoht & pakkuja",
@@ -629,6 +680,7 @@
         "Campaigns": "Kampaaniad",
         "ColumnWebsite": "Veebileht",
         "ColumnWebsitePage": "Veebi lehekülg",
+        "DetailsByReferrerType": "Detailid viitaja tüübi alusel",
         "DirectEntry": "Otse sisenetud",
         "Keywords": "Võtmesõnad",
         "Referrer": "Viitaja",
@@ -642,8 +694,10 @@
         "Type": "Viitaja tüüp",
         "TypeCampaigns": "%s kampaaniatest",
         "TypeDirectEntries": "%s otse sisenemist",
-        "TypeSearchEngines": "%s otsomootoritest",
+        "TypeSearchEngines": "%s otsimootoritest",
         "TypeWebsites": "%s veebilehtedelt",
+        "ViewAllReferrers": "Vaata kõiki viitajaid",
+        "ViewReferrersBy": "Vaata kõiki viitajaid %s järgi",
         "Websites": "Veebilehed",
         "WidgetExternalWebsites": "Väliste viitajate nimekiri",
         "WidgetGetAll": "Kõik viitajad",
@@ -651,8 +705,20 @@
         "WidgetTopKeywordsForPages": "Lehe URL peamised võtmesõnad"
     },
     "ScheduledReports": {
+        "AggregateReportsFormat": "(valikuline) Kuvamise valikud",
+        "CreateAndScheduleReport": "Loo ja ajasta raporti käivitumine",
+        "CreateReport": "Loo raport",
         "EmailReports": "E-posti raportid",
-        "ManageEmailReports": "Halda e-posti raporteid"
+        "EmailSchedule": "E-posti ajastamine",
+        "ManageEmailReports": "Halda e-posti raporteid",
+        "Pagination": "Lehekülg %s \/ %s",
+        "ReportFormat": "Raporti formaat",
+        "ReportHour": "Raporti saatmise aeg",
+        "ReportsIncluded": "Statistika osade kaasamine",
+        "ReportType": "Raporti saatmise kanal",
+        "SendReportNow": "Saada raport kohe",
+        "SendReportTo": "Raporti saaja",
+        "ThereIsNoReportToManage": "Puuduvad olemasolevad raportid veebilehe %s kohta"
     },
     "SegmentEditor": {
         "AddNewSegment": "Lisa uus segment",
@@ -676,9 +742,11 @@
         "GlobalWebsitesSettings": "Globaalsed veebilehtede seaded",
         "MainDescription": "Sinu veebianalüütika vajab veebilehti, mida hallata! Lisa, uuenda, kustuta veebilehti, ja näita Javascript koodi mida lisada veebilehtedele.",
         "NoWebsites": "Sul pole saite mida administreerida.",
+        "ShowTrackingTag": "Kuva jälgimiskood",
         "Sites": "Veebilehed",
         "Timezone": "Ajavöönd",
         "TrackingSiteSearch": "Lehe sisemisest otsingust andmete kogumine",
+        "TrackingTags": "Jälgimiskood lehele %s",
         "Urls": "URL-id",
         "UTCTimeIs": "UTC aeg on %s.",
         "WebsitesManagement": "Veebilehe haldamine"
@@ -1013,6 +1081,7 @@
         "Cities": "Linnad",
         "Countries": "Riigid",
         "DaysAgo": "%s päeva tagasi",
+        "GoalConversions": "%s tulutoovaid eesmärke",
         "Hours": "tundi",
         "HoursAgo": "%s tundi tagasi",
         "map": "kaart",
@@ -1228,6 +1297,7 @@
         "OperatingSystemFamily": "OP-süsteemi tüüp",
         "OperatingSystems": "Operatsioonisüsteemid",
         "Resolutions": "Ekraani resolutsioonid",
+        "VisitorSettings": "Külastajate seaded",
         "WideScreen": "Laiekraan",
         "WidgetBrowserFamilies": "Veebisirvija tüüp",
         "WidgetBrowsers": "Külastajate veebisirvijad",
@@ -1245,7 +1315,7 @@
         "ApplyToAllWebsites": "Laienda kõigile veebilehtedele",
         "ChangeAllConfirm": "Kas sa oled kindel soovis anda '%s' õigused kõigile veebilehtedele?",
         "DeleteConfirm": "Kas oled kindel, et soovid %s kustutada?",
-        "Email": "Email",
+        "Email": "E-post",
         "ExceptionAdminAnonymous": "Sa ei saa anda 'admin' õiguseid 'anonymous' kasutajale.",
         "ExceptionDeleteDoesNotExist": "Kasutajat nimega '%s' ei eksisteeri seepärast ei saa teda ka kustutada.",
         "ExceptionEditAnonymous": "Anonüümset kasutajat ei saa muuta ega kustutada. Piwik kasutab seda määratlemaks kasutajat, kes ei ole veel sisse loginud. Näiteks, saad teha statistika lubada 'view' statistikat õigused 'anonymous' kasutajale.",
@@ -1253,21 +1323,31 @@
         "ExceptionInvalidEmail": "Emaili aadress ei ole õiges formaadis.",
         "ExceptionLoginExists": "Kasutajanimi '%s' on kasutusel.",
         "ExceptionUserDoesNotExist": "Kasutaja '%s' puudub.",
+        "ExcludeVisitsViaCookie": "Arva ennast külastajate hulgast välja kasutades küpsist",
+        "IfYouWouldLikeToChangeThePasswordTypeANewOne": "Kui soovid parooli vahetada, siis sisesta siia uus. Vastasel korral jäta tühjaks.",
         "MainDescription": "Otsusta millistel kasutajatel on ligipääs analüütikale. Saad seada õigused kõigile veebilehtedele korraga.",
         "ManageAccess": "Halda ligipääsu",
+        "MenuAnonymousUserSettings": "Tundmatu kasutaja seaded",
         "MenuUsers": "Kasutajad",
+        "MenuUserSettings": "Kasutaja seaded",
         "PrivAdmin": "Admin",
         "PrivNone": "Ligipääs puudub",
         "PrivView": "Vaata",
+        "ReportDateToLoadByDefault": "Vaikimisi laetav raporti kuupäev",
+        "ReportToLoadByDefault": "Vaikimisi laetav raport",
+        "TheSuperUserAliasCannotBeChanged": "Peakasutaja aliast ei saa muuta.",
+        "TypeYourPasswordAgain": "Korda oma uut parooli.",
         "User": "Kasutaja",
         "UsersManagement": "Kasutajate haldamine",
-        "UsersManagementMainDescription": "Loo uusi kasutajakontosid või uuenda olemasolevaid. Saad seada nende õigused ülalpool."
+        "UsersManagementMainDescription": "Loo uusi kasutajakontosid või uuenda olemasolevaid. Saad seada nende õigused ülalpool.",
+        "YourUsernameCannotBeChanged": "Sinu kasutajanime ei saa muuta."
     },
     "VisitFrequency": {
         "ColumnActionsByReturningVisits": "Tegevused korduvate külastuste kaupa",
         "ColumnAvgActionsPerReturningVisit": "Keskmine tegevuste arv korduvatel külastustel",
         "ColumnBounceCountForReturningVisits": "Korduvate külastuste põrke arv",
         "ColumnBounceRateForReturningVisits": "Korduvate külastuste põrkemäär",
+        "ColumnNbReturningVisitsConverted": "Tulutoovaid korduvaid külastusi",
         "ColumnReturningVisits": "Korduvad külastused",
         "ReturnActions": "%s tegevust korduval külastusel",
         "ReturnAverageVisitDuration": "%s keskmine külastuse kestvus korduvatel külastustel",
@@ -1286,9 +1366,9 @@
         "PlusXMin": "%s min",
         "VisitNum": "Külastuste arv",
         "VisitsByDaysSinceLast": "Külastused viimase külastusaja järgi",
-        "visitsByVisitCount": "Külastusi külastuste arvu järgi",
-        "VisitsPerDuration": "Külastusi külastuste pikkuse järgi",
-        "VisitsPerNbOfPages": "Külastusi külastatud lehtede arvu järgi",
+        "visitsByVisitCount": "Külastused külastuste arvu järgi",
+        "VisitsPerDuration": "Külastused külastuste pikkuse järgi",
+        "VisitsPerNbOfPages": "Külastused külastatud lehtede arvu järgi",
         "WidgetLengths": "Külastuste kestvus",
         "WidgetPages": "Erinevaid lehti külastuse kohta",
         "WidgetVisitsByDaysSinceLast": "Külastused viimase külastusaja järgi"
@@ -1302,6 +1382,7 @@
         "NbActionsDescription": "%s tegevust",
         "NbActionsPerVisit": "%s tegevust (lehe vaatamist, allalaadimist, väljuvat linki ja lehesisest otsingut) külastuse jooksul",
         "NbDownloadsDescription": "%s allalaadimist",
+        "NbKeywordsDescription": "%s unikaalseid võtmesõnu",
         "NbOutlinksDescription": "%s väljuvat linki",
         "NbPageviewsDescription": "%s lehevaatamist",
         "NbSearchesDescription": "%s otsingut kokku antud veebilehel",
@@ -1310,6 +1391,7 @@
         "NbUniquePageviewsDescription": "%s unikaalset lehevaatamist",
         "NbUniqueVisitors": "%s unikaalset külastajat",
         "NbVisitsBounced": "%s külastajaid põrkas (lahkus peale ühe lehe kuvamist)",
+        "VisitsSummary": "Külastuste kokkuvõte",
         "WidgetLastVisits": "Viimaste külastuste graafik",
         "WidgetOverviewGraph": "Graafikutega ülevaade",
         "WidgetVisits": "Külastuste ülevaade"
diff --git a/lang/fr.json b/lang/fr.json
index e7e0d90240291c1335e32923c4fa822214af390c..c6e0cfc7847f5d1b7c40265bcfa02154541f2109 100644
--- a/lang/fr.json
+++ b/lang/fr.json
@@ -156,7 +156,6 @@
         "PluginSettings": "Paramètres du composant",
         "PluginSettingsIntro": "Vous pouvez ici modifier les paramètres des composants tierce partie suivants :",
         "PluginSettingsValueNotAllowed": "La valeur pour le champ \"%s\" du composant \"%s\" n'est pas autorisée.",
-        "ScheduledTasks": "Tâches planifiées",
         "StableReleases": "Si Piwik représente une part critique de vos affaires, nous vous recommandons d'utiliser la dernière version stable. Si vous utilisez la dernière version et que vous trouverez un bug ou avez une suggestion, %scliquez ici%s svp.",
         "TrackAGoal": "Effectuer le suivi d'un objectif",
         "TrackingCode": "Code de suivi",
diff --git a/lang/hr.json b/lang/hr.json
index 455a9efe0112300d342c83381eb0730bbc21e5a4..314afd501a6581d54e3978ac091da24ab12361b3 100644
--- a/lang/hr.json
+++ b/lang/hr.json
@@ -46,9 +46,11 @@
         "SubmenuPageTitles": "Naslovi stranica",
         "SubmenuSitesearch": "Pretraga stranice",
         "WidgetExitPageTitles": "Izlazni naslovi stranica",
+        "WidgetPagesEntry": "Ulazne stranice",
         "WidgetPagesExit": "Izlazne stranice",
         "WidgetPageTitles": "Naslovi stranica",
-        "WidgetPageTitlesFollowingSearch": "Naslovi stranica kod pretraživanja"
+        "WidgetPageTitlesFollowingSearch": "Naslovi stranica kod pretraživanja",
+        "WidgetSearchCategories": "Pretraži kategoije"
     },
     "Annotations": {
         "AddAnnotationsFor": "Dodaj bilješke za %s...",
@@ -64,10 +66,17 @@
         "TrackingCode": "Kod za praćenje"
     },
     "CoreHome": {
+        "CheckForUpdates": "Provjeri nadogradnje",
         "PeriodDay": "dan",
+        "PeriodDays": "Dana",
         "PeriodMonth": "mjesec",
+        "PeriodMonths": "mjeseci",
         "PeriodWeek": "tjedan",
-        "PeriodYear": "godina"
+        "PeriodYear": "godina",
+        "PeriodYears": "godine"
+    },
+    "CorePluginsAdmin": {
+        "ActionInstall": "Instaliraj"
     },
     "Dashboard": {
         "Dashboard": "Upravljačka ploča"
diff --git a/lang/it.json b/lang/it.json
index b6f54a9662e290fecf6da2bc7d5009415acadbf6..8f1626ea3bc627589c6dff7f4e4fd916a289d082 100644
--- a/lang/it.json
+++ b/lang/it.json
@@ -156,7 +156,6 @@
         "PluginSettings": "Impostazioni plugin",
         "PluginSettingsIntro": "Qui puoi cambiare le impostazioni dei seguenti plugins di terze parti:",
         "PluginSettingsValueNotAllowed": "Il valore del campo \"%s\" nel plugin \"%s\" non è consentito",
-        "ScheduledTasks": "Attività pianificate",
         "StableReleases": "Se Piwik rappresenta una parte fondamentale nella vostra attività, vi raccomandiamo di utilizzare l'ultima versione stabile. Se utilizzate l'ultima versione beta e riscontrate un bug o avete dei suggerimenti, per favore %sguardate qui%s.",
         "TrackAGoal": "Traccia un obiettivo",
         "TrackingCode": "Codice di Tracciamento",
diff --git a/lang/nl.json b/lang/nl.json
index e24231428f1ac6767d10891857d64710b169d5e0..f78d39b23f0d41d3145a2b349664fde306b671ce 100644
--- a/lang/nl.json
+++ b/lang/nl.json
@@ -155,7 +155,6 @@
         "PluginSettings": "Plugin instellingen",
         "PluginSettingsIntro": "Hier kunt u instellingen aanpassen voor de volgende plugins van derden:",
         "PluginSettingsValueNotAllowed": "De waarde voor veld \"%s\" in plugin \"%s\" is niet toegestaan",
-        "ScheduledTasks": "Geplande Taken",
         "StableReleases": "Indien Piwik een essentieel onderdeel is van uw zaak, dan raaden wij aan om de laatste stabiele versie te draaien. Indien je de laatste beta gebruikt en je ontdekt bugs of hebt een suggestie, %skijk dan hier%s.",
         "TrackAGoal": "Hou een doel bij.",
         "TrackingCode": "Tracking code.",
@@ -991,6 +990,7 @@
         "PluginDescription": "Genereer mooie PNG Grafieken voor elk Piwik rapport."
     },
     "Installation": {
+        "CollaborativeProject": "Piwik is een samenwerkingsproject, met liefde gebouwd door mensen van over de hele wereld.",
         "CommunityNewsletter": "stuur mij e-mails met community updates (nieuwe plugins, nieuwe features, enz.)",
         "ConfigurationHelp": "Uw Piwik configuratie bestand is waarschijnlijk niet correct geconfigureerd. U kunt ofwel config\/config.ini.php verwijderen en de installatie vervolgen of de toegangsgegevens voor de database corrigeren.",
         "ConfirmDeleteExistingTables": "Bent u zeker dat u de tabellen wilt verwijderen: %s uit uw datbase? WAARSCHUWING: DATA VAN DEZE TABELLEN KAN NIET WORDEN HERSTELD!",
@@ -1586,6 +1586,8 @@
     },
     "UserCountry": {
         "CannotFindGeoIPDatabaseInArchive": "Kan bestand %1$s niet vinden in tar archief %2$s!",
+        "CannotListContent": "Kon geen lijst maken van de inhoud voor %1$s: %2$s",
+        "CannotLocalizeLocalIP": "IP-adres %s is een lokaal adres en kan geen geolocatie op toegepast worden.",
         "CannotUnzipDatFile": "Kan dat bestand niet uitpakken in %1$s: %2$s",
         "City": "Stad",
         "CityAndCountry": "%1$s, %2$s",
@@ -1880,28 +1882,44 @@
         "FoundApacheModules": "Piwik vond de volgende Apache modules",
         "FromDifferentCities": "andere steden",
         "GeoIPDatabases": "GeoIP Databases",
+        "GeoIPImplHasAccessTo": "Deze GeoIP implementatie heeft toegang tot de volgende database types",
+        "GeoIPNoServerVars": "Piwik kan geen GeoIP %s variabelen vinden.",
         "GeoIPPeclCustomDirNotSet": "De %s PHP ini optie is niet ingesteld.",
+        "GeoIPServerVarsFound": "Piwik detecteert de volgende GeoIP %s variabelen",
+        "GeoLiteCityLink": "Als u de GeoLite City database gebruikt, gebruik dan deze link: %1$s%2$s%3$s.",
         "Geolocation": "Geolocatie",
         "GeolocationPageDesc": "Op deze pagina kunt u instellen hoe Piwik bezoeker locaties bepaald.",
+        "getCityDocumentation": "Dit rapport laat zien in welke stad uw bezoekers waren toen ze uw website bezochten.",
+        "getContinentDocumentation": "Dit rapport laat zien in welk continent uw bezoekers waren toen ze uw website bezochten.",
+        "getCountryDocumentation": "Dit rapport laat zien in welk land uw bezoekers waren toen ze uw website bezochten.",
+        "getRegionDocumentation": "Dit rapport laat zien in welke regio uw bezoekers waren toen ze uw website bezochten.",
         "HowToInstallApacheModule": "Hoe installeer ik de GeoIP module voor Apache?",
         "HowToInstallGeoIPDatabases": "Hoe krijg ik de GeoIP databases?",
         "HowToInstallGeoIpPecl": "Hoe installeer ik de GeoIP PECL extensie?",
         "HowToInstallNginxModule": "Hoe installeer ik de GeoIP module voor Nginx?",
         "HowToSetupGeoIP": "Hoe zet ik accurate geolocatie op met GeoIP",
+        "HowToSetupGeoIP_Step1": "%1$sDownload%2$s de GeoLite City database van %3$sMaxMind%4$s.",
+        "HowToSetupGeoIP_Step2": "Pak dit bestand uit en kopieer het resultaat, %1$s in de %2$smisc%3$s Piwik directory (u kunt dit doen met FTP of SSH).",
         "HowToSetupGeoIP_Step4": "Klaar! U heeft zojuist Piwik ingesteld om GeoIP te gebruiken. U kunt nu zien uit welke regio's en steden uw bezoekers komen i.c.m. zeer accurate informatie over het land van herkomst.",
+        "HttpServerModule": "HTTP Server Module",
+        "InvalidGeoIPUpdatePeriod": "Ongeldige periode voor de GeoIP updater: %1$s. Geldige waardes zijn %2$s.",
         "ISPDatabase": "ISP database",
         "IWantToDownloadFreeGeoIP": "Ik wil de gratis GeoIP database downloaden...",
         "Latitude": "Breedtegraad",
         "Location": "Locatie",
         "LocationDatabase": "Locatie database",
+        "LocationDatabaseHint": "Een locatie database is of een land of een regio of een stad database.",
         "LocationProvider": "Locatie Provider",
         "Longitude": "Lengtegraad",
         "Organization": "Organisatie",
+        "OrgDatabase": "Organisatie Database",
+        "PiwikNotManagingGeoIPDBs": "Piwik beheert momenteel geen GeoIP databases.",
         "PluginDescription": "Rapporteert het land van de bezoekers.",
         "Region": "Regio",
         "SetupAutomaticUpdatesOfGeoIP": "Stel automatische updates van GeoIP databases in",
         "SubmenuLocations": "Locaties",
         "ThisUrlIsNotAValidGeoIPDB": "Het gedownloade bestand is geen valide GeoIP database. Controleer de link a.u.b. opnieuw, of download het bestand handmatig.",
+        "ToGeolocateOldVisits": "Om locatie data voor oude bezoeken te krijgen, gebruik het %1$shier%2$s beschreven script.",
         "UpdaterHasNotBeenRun": "De updater is nog niet eerder uitgevoerd.",
         "UpdaterWasLastRun": "De updater is voor het laatst uitgevoerd op %s.",
         "WidgetLocation": "Bezoeker Locatie"
diff --git a/misc/log-analytics/import_logs.py b/misc/log-analytics/import_logs.py
index 68eff897d055bb2dd3cbf405a4715c3e6e635b91..7c34147b65e56987276d6a44b989a487ebea528b 100755
--- a/misc/log-analytics/import_logs.py
+++ b/misc/log-analytics/import_logs.py
@@ -66,6 +66,7 @@ DOWNLOAD_EXTENSIONS = (
 EXCLUDED_USER_AGENTS = (
     'adsbot-google',
     'ask jeeves',
+    'baidubot',
     'bot-',
     'bot/',
     'ccooter/',
diff --git a/plugins/CoreHome/javascripts/dataTable.js b/plugins/CoreHome/javascripts/dataTable.js
index 26b3dc2b72d8c41018aa8395f5726ef373010dc5..22fb2b8145003ee2e1ec06be5cb773a42ca6f7d0 100644
--- a/plugins/CoreHome/javascripts/dataTable.js
+++ b/plugins/CoreHome/javascripts/dataTable.js
@@ -1097,6 +1097,11 @@ $.extend(DataTable.prototype, UIControl.prototype, {
             return;
         }
 
+        if(domElemToTruncate.find('.truncationDisabled').length > 0) {
+            return;
+        }
+
+
         // make the original text (before truncation) available for others.
         // the .truncate plugins adds a title to the dom element but the .tooltip
         // plugin removes that again.
diff --git a/plugins/CoreVisualizations/Visualizations/Graph.php b/plugins/CoreVisualizations/Visualizations/Graph.php
index d182ffb89552dc7f3b4969ded08b7055668ff18d..3fabb186e3c735d42a122dedee2674bd135196fa 100644
--- a/plugins/CoreVisualizations/Visualizations/Graph.php
+++ b/plugins/CoreVisualizations/Visualizations/Graph.php
@@ -156,4 +156,4 @@ abstract class Graph extends Visualization
 
         $this->config->selectable_columns = $transformed;
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/Dashboard/stylesheets/dashboard.less b/plugins/Dashboard/stylesheets/dashboard.less
index d38b2941383d90bf00914d2f961a602aec084cdd..d8bb57e4e858ecede961e1a7368c0e1ea32d9339 100644
--- a/plugins/Dashboard/stylesheets/dashboard.less
+++ b/plugins/Dashboard/stylesheets/dashboard.less
@@ -76,8 +76,7 @@
   border: 1px solid #bbb6ad;
   margin: 10px 7px;
   border-radius: 4px;
-  overflow-x: hidden;
-  overflow-y: visible;
+  overflow: hidden;
   font-size: 14px;
   z-index: 1;
 }
diff --git a/plugins/DevicesDetection/lang/bg.json b/plugins/DevicesDetection/lang/bg.json
index b2835a859a07a1a908ee5e80dfdd400161c7fd0e..bb76a580ee0d944ae16485fb8260b990687ba5e3 100644
--- a/plugins/DevicesDetection/lang/bg.json
+++ b/plugins/DevicesDetection/lang/bg.json
@@ -6,6 +6,7 @@
         "dataTableLabelModels": "Модел",
         "dataTableLabelSystemVersion": "Версия на операционната система",
         "dataTableLabelTypes": "Тип",
+        "Device": "Устройство",
         "DeviceBrand": "Марка на устройството",
         "DeviceModel": "Модел на устройството",
         "DevicesDetection": "Устройства, които използва посетителят",
diff --git a/plugins/Goals/Controller.php b/plugins/Goals/Controller.php
index e55ea756fb2c3a8c2bba284539fe3a43e13ea3ec..a53e63a8472f8090ef356106fb1c8a268e68d9cd 100644
--- a/plugins/Goals/Controller.php
+++ b/plugins/Goals/Controller.php
@@ -452,10 +452,10 @@ class Controller extends \Piwik\Plugin\Controller
             foreach ($allReports as $category => $reports) {
                 $categoryText = Piwik::translate('Goals_ViewGoalsBy', $category);
                 foreach ($reports as $report) {
-                    $customParams['viewDataTable'] = 'tableGoals';
-                    if (in_array($report['action'], array('getVisitsUntilConversion', 'getDaysToConversion'))) {
-                        $customParams['viewDataTable'] = 'table';
+                    if(empty($report['viewDataTable'])) {
+                        $report['viewDataTable'] = 'tableGoals';
                     }
+                    $customParams['viewDataTable'] = $report['viewDataTable'];
 
                     $goalReportsByDimension->addReport(
                         $categoryText, $report['name'], $report['module'] . '.' . $report['action'], $customParams);
diff --git a/plugins/Goals/Goals.php b/plugins/Goals/Goals.php
index 5a5de35886e2de1bf971de7eabaa1ebb2cde0d0d..26548732af3c66bda9d64e75eac34a398b54dee3 100644
--- a/plugins/Goals/Goals.php
+++ b/plugins/Goals/Goals.php
@@ -419,12 +419,14 @@ class Goals extends \Piwik\Plugin
             array('category' => Piwik::translate('General_Visit'),
                   'name'     => Piwik::translate('Goals_VisitsUntilConv'),
                   'module'   => 'Goals',
-                  'action'   => 'getVisitsUntilConversion'
+                  'action'   => 'getVisitsUntilConversion',
+                  'viewDataTable' => 'table',
             ),
             array('category' => Piwik::translate('General_Visit'),
                   'name'     => Piwik::translate('Goals_DaysToConv'),
                   'module'   => 'Goals',
-                  'action'   => 'getDaysToConversion'
+                  'action'   => 'getDaysToConversion',
+                  'viewDataTable' => 'table',
             )
         );
         $dimensions = array_merge($dimensions, $reportWithGoalMetrics);
diff --git a/plugins/Live/stylesheets/live.less b/plugins/Live/stylesheets/live.less
index 517ace03a526e3bd95581bcc2ee504636f995ab4..8003a7bc680c194def27d31e3706f5f815b6430f 100644
--- a/plugins/Live/stylesheets/live.less
+++ b/plugins/Live/stylesheets/live.less
@@ -80,7 +80,7 @@ ol.visitorLog {
     text-overflow: ellipsis;
     white-space: nowrap;
     display:inline-block;
-    max-width:100%;
+    max-width:90%;
     overflow: -moz-hidden-unscrollable;
 }
 
@@ -204,7 +204,7 @@ a.visitor-log-visitor-profile-link {
 .visitorLog,.visitor-profile-actions {
     > li > div {
         display:inline-block;
-        width:95%;
+        width:85%;
         vertical-align:top;
     }
 }
diff --git a/plugins/SegmentEditor/API.php b/plugins/SegmentEditor/API.php
index f4c89944e907f231588ec224eb25e74dca3aca8a..309b68e469b77ba59164c662ddb70ffb5e087750 100644
--- a/plugins/SegmentEditor/API.php
+++ b/plugins/SegmentEditor/API.php
@@ -113,6 +113,16 @@ class API extends \Piwik\Plugin\API
         }
     }
 
+    protected function checkUserCanModifySegment($segment)
+    {
+        if(Piwik::isUserIsSuperUser()) {
+            return;
+        }
+        if($segment['login'] != Piwik::getCurrentUserLogin()) {
+            throw new Exception($this->getMessageCannotEditSegmentCreatedBySuperUser());
+        }
+    }
+
     /**
      * Deletes a stored segment.
      *
@@ -123,9 +133,11 @@ class API extends \Piwik\Plugin\API
     {
         $this->checkUserIsNotAnonymous();
 
-        $this->sendSegmentDeactivationEvent($idSegment);
+        $segment = $this->getSegmentOrFail($idSegment);
+
+        $this->checkUserCanModifySegment($segment);
 
-        $this->getSegmentOrFail($idSegment);
+        $this->sendSegmentDeactivationEvent($idSegment);
 
         $db = Db::get();
         $db->delete(Common::prefixTable('segment'), 'idsegment = ' . $idSegment);
@@ -149,6 +161,8 @@ class API extends \Piwik\Plugin\API
         $this->checkUserIsNotAnonymous();
         $segment = $this->getSegmentOrFail($idSegment);
 
+        $this->checkUserCanModifySegment($segment);
+
         $idSite = $this->checkIdSite($idSite);
         $this->checkSegmentName($name);
         $definition = $this->checkSegmentValue($definition, $idSite);
@@ -327,7 +341,9 @@ class API extends \Piwik\Plugin\API
      */
     private function getMessageCannotEditSegmentCreatedBySuperUser()
     {
-        return "You can only edit the custom segments you have created yourself. This segment was created and 'shared with you' by the Super User. " .
-        "To modify this segment, you can first create a new one by clicking on 'Add new segment'. Then you can customize the segment's definition.";
+        $message = "You can only edit and delete custom segments that you have created yourself. This segment was created and 'shared with you' by the Super User. " .
+            "To modify this segment, you can first create a new one by clicking on 'Add new segment'. Then you can customize the segment's definition.";
+
+        return $message;
     }
 }
diff --git a/plugins/TasksTimetable b/plugins/TasksTimetable
index 1bc95298af8f4416f2a9e74a6a1179fd0dbf390a..6f1457e5e2c50275576d0fe690ea8f6a89f71053 160000
--- a/plugins/TasksTimetable
+++ b/plugins/TasksTimetable
@@ -1 +1 @@
-Subproject commit 1bc95298af8f4416f2a9e74a6a1179fd0dbf390a
+Subproject commit 6f1457e5e2c50275576d0fe690ea8f6a89f71053
diff --git a/plugins/UserSettings/UserSettings.php b/plugins/UserSettings/UserSettings.php
index f12004278bf1ab66c9be6b7208f0a5f84ecbacc2..c74c41173323502d83f3ef26d77b62afac893a16 100644
--- a/plugins/UserSettings/UserSettings.php
+++ b/plugins/UserSettings/UserSettings.php
@@ -10,7 +10,6 @@
  */
 namespace Piwik\Plugins\UserSettings;
 
-use Piwik\ArchiveProcessor;
 use Piwik\Menu\MenuMain;
 use Piwik\Piwik;
 use Piwik\Plugin\ViewDataTable;
@@ -466,4 +465,4 @@ class UserSettings extends \Piwik\Plugin
         MenuMain::getInstance()->add('General_Visitors', 'General_Settings', array('module' => 'UserSettings', 'action' => 'index'));
     }
 
-}
\ No newline at end of file
+}
diff --git a/tests/PHPUnit/Integration/Core/PiwikTest.php b/tests/PHPUnit/Integration/Core/PiwikTest.php
index 1c310c8a0cc375872b625861b47348eacd7c16a5..b67954183b9861e1f95d7102178a5df16f67bb23 100644
--- a/tests/PHPUnit/Integration/Core/PiwikTest.php
+++ b/tests/PHPUnit/Integration/Core/PiwikTest.php
@@ -147,7 +147,9 @@ class Core_PiwikTest extends DatabaseTestCase
             array(1.002, array('1s', '00:00:01')),
             array(1.02, array('1.02s', '00:00:01.02')),
             array(1.2, array('1.2s', '00:00:01.20')),
-            array(122.1, array('2 min 2.1s', '00:02:02.10'))
+            array(122.1, array('2 min 2.1s', '00:02:02.10')),
+            array(-122.1, array('-2 min 2.1s', '-00:02:02.10')),
+            array(86400 * -365, array('-365 days 0 hours', '-8760:00:00'))
         );
     }
 
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_year.xml b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_year.xml
index 4b3ecdcb69f61ae2c38be39277630a6e5195bd91..7b30892ba0eea82b8707a500cde0819caafa4876 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_year.xml
+++ b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_year.xml
@@ -2,8 +2,8 @@
 <result>
 	<row>
 		<idSite>1</idSite>
-		<idVisit>18</idVisit>
-		<visitIp>1.2.4.8</visitIp>
+		<idVisit>11</idVisit>
+		<visitIp>1.2.4.5</visitIp>
 		
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
@@ -11,82 +11,51 @@
 		<visitConvertedIcon>plugins/Zeitgeist/images/goal.png</visitConvertedIcon>
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
-		<searches>1</searches>
-		<events>1</events>
-		<actions>3</actions>
+		<searches>0</searches>
+		<events>0</events>
+		<actions>1</actions>
 		<actionDetails>
 			<row>
 				<type>goal</type>
 				<goalName>all</goalName>
 				<goalId>1</goalId>
 				<revenue>5</revenue>
-				<goalPageId>30</goalPageId>
+				<goalPageId>19</goalPageId>
 				
-				<url>http://piwik.net/space/quest/iv</url>
+				<url>http://piwik.net/grue/lair</url>
 				<icon>plugins/Zeitgeist/images/goal.png</icon>
 			</row>
 			<row>
 				<type>action</type>
-				<url>http://piwik.net/space/quest/iv</url>
-				<pageTitle>Space Quest XII</pageTitle>
-				<pageIdAction>4</pageIdAction>
-				
-				<pageId>30</pageId>
-				<timeSpent>360</timeSpent>
-				<timeSpentPretty>6 min 0s</timeSpentPretty>
-				<icon />
-			</row>
-			<row>
-				<type>search</type>
-				<url />
-				<pageIdAction />
+				<url>http://piwik.net/grue/lair</url>
+				<pageTitle>It&amp;#039;s &lt;script&gt; pitch black...</pageTitle>
+				<pageIdAction>2</pageIdAction>
 				
-				<pageId>31</pageId>
+				<pageId>19</pageId>
 				<customVariables>
 					<row>
-						<customVariablePageName4>Search Category</customVariablePageName4>
-						<customVariablePageValue4>CAT</customVariablePageValue4>
+						<customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2>
+						<customVariablePageValue2>Cvar2 PAGE value is 5</customVariablePageValue2>
+					</row>
+					<row>
+						<customVariablePageName5>Cvar 5 PAGE name</customVariablePageName5>
+						<customVariablePageValue5>Cvar5 PAGE value is 5</customVariablePageValue5>
 					</row>
 				</customVariables>
-				<siteSearchKeyword>Bring on the party</siteSearchKeyword>
-				<timeSpent>180</timeSpent>
-				<timeSpentPretty>3 min 0s</timeSpentPretty>
-				<icon>plugins/Zeitgeist/images/search_ico.png</icon>
-			</row>
-			<row>
-				<type>goal</type>
-				<goalName>two</goalName>
-				<goalId>2</goalId>
-				<revenue>5</revenue>
-				<goalPageId />
-				
-				<url>http://piwik.net/space/quest/iv</url>
-				<icon>plugins/Zeitgeist/images/goal.png</icon>
-			</row>
-			<row>
-				<type>event</type>
-				<url>http://piwik.net/space/quest/iv</url>
-				<pageIdAction>4</pageIdAction>
-				
-				<pageId>32</pageId>
-				<eventCategory>Cat8</eventCategory>
-				<eventAction>Action8</eventAction>
-				<eventName>Name8</eventName>
-				<eventValue>353.678</eventValue>
-				<icon>plugins/Zeitgeist/images/event.png</icon>
+				<icon />
 			</row>
 		</actionDetails>
 		<customVariables>
 			<row>
 				<customVariableName1>Cvar 1 name</customVariableName1>
-				<customVariableValue1>Cvar1 value is 8</customVariableValue1>
+				<customVariableValue1>Cvar1 value is 5</customVariableValue1>
 			</row>
 			<row>
 				<customVariableName5>Cvar 5 name</customVariableName5>
-				<customVariableValue5>Cvar5 value is 8</customVariableValue5>
+				<customVariableValue5>Cvar5 value is 5</customVariableValue5>
 			</row>
 		</customVariables>
-		<goalConversions>2</goalConversions>
+		<goalConversions>1</goalConversions>
 		<siteCurrency>USD</siteCurrency>
 		<siteCurrencySymbol>$</siteCurrencySymbol>
 		
@@ -96,21 +65,21 @@
 		
 		
 		
-		<visitDuration>1262</visitDuration>
-		<visitDurationPretty>21 min 2s</visitDurationPretty>
+		<visitDuration>0</visitDuration>
+		<visitDurationPretty>0s</visitDurationPretty>
 		<visitCount>5</visitCount>
-		<daysSinceLastVisit>10</daysSinceLastVisit>
-		<daysSinceFirstVisit>100</daysSinceFirstVisit>
-		<daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder>
-		<continent>Unknown</continent>
-		<continentCode>unk</continentCode>
-		<country>Unknown</country>
-		<countryCode>xx</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag>
-		<region />
-		<regionCode />
-		<city />
-		<location>Unknown</location>
+		<daysSinceLastVisit>11</daysSinceLastVisit>
+		<daysSinceFirstVisit>101</daysSinceFirstVisit>
+		<daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder>
+		<continent>Europe</continent>
+		<continentCode>eur</continentCode>
+		<country>Russian Federation</country>
+		<countryCode>ru</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/ru.png</countryFlag>
+		<region>Saint Petersburg City</region>
+		<regionCode>66</regionCode>
+		<city>Stratford-upon-Avon</city>
+		<location>Stratford-upon-Avon, Saint Petersburg City, Russian Federation</location>
 		<latitude />
 		<longitude />
 		<provider>Unknown</provider>
@@ -157,8 +126,8 @@
 	</row>
 	<row>
 		<idSite>1</idSite>
-		<idVisit>17</idVisit>
-		<visitIp>1.2.4.8</visitIp>
+		<idVisit>10</idVisit>
+		<visitIp>1.2.4.4</visitIp>
 		
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
@@ -166,51 +135,82 @@
 		<visitConvertedIcon>plugins/Zeitgeist/images/goal.png</visitConvertedIcon>
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
-		<searches>0</searches>
-		<events>0</events>
-		<actions>1</actions>
+		<searches>1</searches>
+		<events>1</events>
+		<actions>3</actions>
 		<actionDetails>
 			<row>
 				<type>goal</type>
 				<goalName>all</goalName>
 				<goalId>1</goalId>
 				<revenue>5</revenue>
-				<goalPageId>29</goalPageId>
+				<goalPageId>16</goalPageId>
 				
-				<url>http://piwik.net/grue/lair</url>
+				<url>http://piwik.net/space/quest/iv</url>
 				<icon>plugins/Zeitgeist/images/goal.png</icon>
 			</row>
 			<row>
 				<type>action</type>
-				<url>http://piwik.net/grue/lair</url>
-				<pageTitle>It&amp;#039;s &lt;script&gt; pitch black...</pageTitle>
-				<pageIdAction>2</pageIdAction>
+				<url>http://piwik.net/space/quest/iv</url>
+				<pageTitle>Space Quest XII</pageTitle>
+				<pageIdAction>4</pageIdAction>
+				
+				<pageId>16</pageId>
+				<timeSpent>360</timeSpent>
+				<timeSpentPretty>6 min 0s</timeSpentPretty>
+				<icon />
+			</row>
+			<row>
+				<type>search</type>
+				<url />
+				<pageIdAction />
 				
-				<pageId>29</pageId>
+				<pageId>17</pageId>
 				<customVariables>
 					<row>
-						<customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2>
-						<customVariablePageValue2>Cvar2 PAGE value is 8</customVariablePageValue2>
-					</row>
-					<row>
-						<customVariablePageName5>Cvar 5 PAGE name</customVariablePageName5>
-						<customVariablePageValue5>Cvar5 PAGE value is 8</customVariablePageValue5>
+						<customVariablePageName4>Search Category</customVariablePageName4>
+						<customVariablePageValue4>CAT</customVariablePageValue4>
 					</row>
 				</customVariables>
-				<icon />
+				<siteSearchKeyword>Bring on the party</siteSearchKeyword>
+				<timeSpent>180</timeSpent>
+				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<icon>plugins/Zeitgeist/images/search_ico.png</icon>
+			</row>
+			<row>
+				<type>goal</type>
+				<goalName>two</goalName>
+				<goalId>2</goalId>
+				<revenue>5</revenue>
+				<goalPageId />
+				
+				<url>http://piwik.net/space/quest/iv</url>
+				<icon>plugins/Zeitgeist/images/goal.png</icon>
+			</row>
+			<row>
+				<type>event</type>
+				<url>http://piwik.net/space/quest/iv</url>
+				<pageIdAction>4</pageIdAction>
+				
+				<pageId>18</pageId>
+				<eventCategory>Cat4</eventCategory>
+				<eventAction>Action4</eventAction>
+				<eventName>Name4</eventName>
+				<eventValue>349.678</eventValue>
+				<icon>plugins/Zeitgeist/images/event.png</icon>
 			</row>
 		</actionDetails>
 		<customVariables>
 			<row>
 				<customVariableName1>Cvar 1 name</customVariableName1>
-				<customVariableValue1>Cvar1 value is 8</customVariableValue1>
+				<customVariableValue1>Cvar1 value is 4</customVariableValue1>
 			</row>
 			<row>
 				<customVariableName5>Cvar 5 name</customVariableName5>
-				<customVariableValue5>Cvar5 value is 8</customVariableValue5>
+				<customVariableValue5>Cvar5 value is 4</customVariableValue5>
 			</row>
 		</customVariables>
-		<goalConversions>1</goalConversions>
+		<goalConversions>2</goalConversions>
 		<siteCurrency>USD</siteCurrency>
 		<siteCurrencySymbol>$</siteCurrencySymbol>
 		
@@ -220,26 +220,26 @@
 		
 		
 		
-		<visitDuration>0</visitDuration>
-		<visitDurationPretty>0s</visitDurationPretty>
+		<visitDuration>1262</visitDuration>
+		<visitDurationPretty>21 min 2s</visitDurationPretty>
 		<visitCount>5</visitCount>
-		<daysSinceLastVisit>11</daysSinceLastVisit>
-		<daysSinceFirstVisit>101</daysSinceFirstVisit>
-		<daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder>
-		<continent>Unknown</continent>
-		<continentCode>unk</continentCode>
-		<country>Unknown</country>
-		<countryCode>xx</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag>
-		<region />
-		<regionCode />
-		<city />
-		<location>Unknown</location>
+		<daysSinceLastVisit>10</daysSinceLastVisit>
+		<daysSinceFirstVisit>100</daysSinceFirstVisit>
+		<daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder>
+		<continent>Europe</continent>
+		<continentCode>eur</continentCode>
+		<country>United Kingdom</country>
+		<countryCode>gb</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/gb.png</countryFlag>
+		<region>Kent</region>
+		<regionCode>G5</regionCode>
+		<city>Stratford-upon-Avon</city>
+		<location>Stratford-upon-Avon, Kent, United Kingdom</location>
 		<latitude />
 		<longitude />
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl>
+		<provider>awesomeisp.com</provider>
+		<providerName>Awesomeisp</providerName>
+		<providerUrl>http://www.awesomeisp.com/</providerUrl>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -281,8 +281,8 @@
 	</row>
 	<row>
 		<idSite>1</idSite>
-		<idVisit>16</idVisit>
-		<visitIp>1.2.4.7</visitIp>
+		<idVisit>9</idVisit>
+		<visitIp>1.2.4.4</visitIp>
 		
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
@@ -291,64 +291,50 @@
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<searches>0</searches>
-		<events>1</events>
-		<actions>2</actions>
+		<events>0</events>
+		<actions>1</actions>
 		<actionDetails>
 			<row>
 				<type>goal</type>
 				<goalName>all</goalName>
 				<goalId>1</goalId>
 				<revenue>5</revenue>
-				<goalPageId>27</goalPageId>
+				<goalPageId>15</goalPageId>
 				
-				<url>http://piwik.net/space/quest/iv</url>
+				<url>http://piwik.net/grue/lair</url>
 				<icon>plugins/Zeitgeist/images/goal.png</icon>
 			</row>
 			<row>
 				<type>action</type>
-				<url>http://piwik.net/space/quest/iv</url>
-				<pageTitle>Space Quest XII</pageTitle>
-				<pageIdAction>4</pageIdAction>
+				<url>http://piwik.net/grue/lair</url>
+				<pageTitle>It&amp;#039;s &lt;script&gt; pitch black...</pageTitle>
+				<pageIdAction>2</pageIdAction>
 				
-				<pageId>27</pageId>
-				<timeSpent>180</timeSpent>
-				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<pageId>15</pageId>
+				<customVariables>
+					<row>
+						<customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2>
+						<customVariablePageValue2>Cvar2 PAGE value is 4</customVariablePageValue2>
+					</row>
+					<row>
+						<customVariablePageName5>Cvar 5 PAGE name</customVariablePageName5>
+						<customVariablePageValue5>Cvar5 PAGE value is 4</customVariablePageValue5>
+					</row>
+				</customVariables>
 				<icon />
 			</row>
-			<row>
-				<type>goal</type>
-				<goalName>two</goalName>
-				<goalId>2</goalId>
-				<revenue>5</revenue>
-				<goalPageId />
-				
-				<url>http://piwik.net/space/quest/iv</url>
-				<icon>plugins/Zeitgeist/images/goal.png</icon>
-			</row>
-			<row>
-				<type>event</type>
-				<url>http://piwik.net/space/quest/iv</url>
-				<pageIdAction>4</pageIdAction>
-				
-				<pageId>28</pageId>
-				<eventCategory>Cat7</eventCategory>
-				<eventAction>Action7</eventAction>
-				<eventName>Name7</eventName>
-				<eventValue>352.678</eventValue>
-				<icon>plugins/Zeitgeist/images/event.png</icon>
-			</row>
 		</actionDetails>
 		<customVariables>
 			<row>
 				<customVariableName1>Cvar 1 name</customVariableName1>
-				<customVariableValue1>Cvar1 value is 7</customVariableValue1>
+				<customVariableValue1>Cvar1 value is 4</customVariableValue1>
 			</row>
 			<row>
 				<customVariableName5>Cvar 5 name</customVariableName5>
-				<customVariableValue5>Cvar5 value is 7</customVariableValue5>
+				<customVariableValue5>Cvar5 value is 4</customVariableValue5>
 			</row>
 		</customVariables>
-		<goalConversions>2</goalConversions>
+		<goalConversions>1</goalConversions>
 		<siteCurrency>USD</siteCurrency>
 		<siteCurrencySymbol>$</siteCurrencySymbol>
 		
@@ -358,26 +344,26 @@
 		
 		
 		
-		<visitDuration>1262</visitDuration>
-		<visitDurationPretty>21 min 2s</visitDurationPretty>
+		<visitDuration>0</visitDuration>
+		<visitDurationPretty>0s</visitDurationPretty>
 		<visitCount>5</visitCount>
-		<daysSinceLastVisit>10</daysSinceLastVisit>
-		<daysSinceFirstVisit>100</daysSinceFirstVisit>
-		<daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder>
+		<daysSinceLastVisit>11</daysSinceLastVisit>
+		<daysSinceFirstVisit>101</daysSinceFirstVisit>
+		<daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
-		<country>Macedonia, the Former Yugoslav Republic of</country>
-		<countryCode>mk</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/mk.png</countryFlag>
-		<region>Miravci</region>
-		<regionCode>66</regionCode>
+		<country>United Kingdom</country>
+		<countryCode>gb</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/gb.png</countryFlag>
+		<region>Kent</region>
+		<regionCode>G5</regionCode>
 		<city>Stratford-upon-Avon</city>
-		<location>Stratford-upon-Avon, Miravci, Macedonia, the Former Yugoslav Republic of</location>
+		<location>Stratford-upon-Avon, Kent, United Kingdom</location>
 		<latitude />
 		<longitude />
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl>
+		<provider>awesomeisp.com</provider>
+		<providerName>Awesomeisp</providerName>
+		<providerUrl>http://www.awesomeisp.com/</providerUrl>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -419,8 +405,8 @@
 	</row>
 	<row>
 		<idSite>1</idSite>
-		<idVisit>15</idVisit>
-		<visitIp>1.2.4.7</visitIp>
+		<idVisit>8</idVisit>
+		<visitIp>1.2.4.3</visitIp>
 		
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
@@ -429,50 +415,64 @@
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<searches>0</searches>
-		<events>0</events>
-		<actions>1</actions>
+		<events>1</events>
+		<actions>2</actions>
 		<actionDetails>
 			<row>
 				<type>goal</type>
 				<goalName>all</goalName>
 				<goalId>1</goalId>
 				<revenue>5</revenue>
-				<goalPageId>26</goalPageId>
+				<goalPageId>13</goalPageId>
 				
-				<url>http://piwik.net/grue/lair</url>
+				<url>http://piwik.net/space/quest/iv</url>
 				<icon>plugins/Zeitgeist/images/goal.png</icon>
 			</row>
 			<row>
 				<type>action</type>
-				<url>http://piwik.net/grue/lair</url>
-				<pageTitle>It&amp;#039;s &lt;script&gt; pitch black...</pageTitle>
-				<pageIdAction>2</pageIdAction>
+				<url>http://piwik.net/space/quest/iv</url>
+				<pageTitle>Space Quest XII</pageTitle>
+				<pageIdAction>4</pageIdAction>
 				
-				<pageId>26</pageId>
-				<customVariables>
-					<row>
-						<customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2>
-						<customVariablePageValue2>Cvar2 PAGE value is 7</customVariablePageValue2>
-					</row>
-					<row>
-						<customVariablePageName5>Cvar 5 PAGE name</customVariablePageName5>
-						<customVariablePageValue5>Cvar5 PAGE value is 7</customVariablePageValue5>
-					</row>
-				</customVariables>
+				<pageId>13</pageId>
+				<timeSpent>180</timeSpent>
+				<timeSpentPretty>3 min 0s</timeSpentPretty>
 				<icon />
 			</row>
+			<row>
+				<type>goal</type>
+				<goalName>two</goalName>
+				<goalId>2</goalId>
+				<revenue>5</revenue>
+				<goalPageId />
+				
+				<url>http://piwik.net/space/quest/iv</url>
+				<icon>plugins/Zeitgeist/images/goal.png</icon>
+			</row>
+			<row>
+				<type>event</type>
+				<url>http://piwik.net/space/quest/iv</url>
+				<pageIdAction>4</pageIdAction>
+				
+				<pageId>14</pageId>
+				<eventCategory>Cat3</eventCategory>
+				<eventAction>Action3</eventAction>
+				<eventName>Name3</eventName>
+				<eventValue>348.678</eventValue>
+				<icon>plugins/Zeitgeist/images/event.png</icon>
+			</row>
 		</actionDetails>
 		<customVariables>
 			<row>
 				<customVariableName1>Cvar 1 name</customVariableName1>
-				<customVariableValue1>Cvar1 value is 7</customVariableValue1>
+				<customVariableValue1>Cvar1 value is 3</customVariableValue1>
 			</row>
 			<row>
 				<customVariableName5>Cvar 5 name</customVariableName5>
-				<customVariableValue5>Cvar5 value is 7</customVariableValue5>
+				<customVariableValue5>Cvar5 value is 3</customVariableValue5>
 			</row>
 		</customVariables>
-		<goalConversions>1</goalConversions>
+		<goalConversions>2</goalConversions>
 		<siteCurrency>USD</siteCurrency>
 		<siteCurrencySymbol>$</siteCurrencySymbol>
 		
@@ -482,21 +482,21 @@
 		
 		
 		
-		<visitDuration>0</visitDuration>
-		<visitDurationPretty>0s</visitDurationPretty>
+		<visitDuration>1262</visitDuration>
+		<visitDurationPretty>21 min 2s</visitDurationPretty>
 		<visitCount>5</visitCount>
-		<daysSinceLastVisit>11</daysSinceLastVisit>
-		<daysSinceFirstVisit>101</daysSinceFirstVisit>
-		<daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder>
+		<daysSinceLastVisit>10</daysSinceLastVisit>
+		<daysSinceFirstVisit>100</daysSinceFirstVisit>
+		<daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
-		<country>Macedonia, the Former Yugoslav Republic of</country>
-		<countryCode>mk</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/mk.png</countryFlag>
-		<region>Miravci</region>
-		<regionCode>66</regionCode>
-		<city>Stratford-upon-Avon</city>
-		<location>Stratford-upon-Avon, Miravci, Macedonia, the Former Yugoslav Republic of</location>
+		<country>United Kingdom</country>
+		<countryCode>gb</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/gb.png</countryFlag>
+		<region>London, City of</region>
+		<regionCode>H9</regionCode>
+		<city>London</city>
+		<location>London, London, City of, United Kingdom</location>
 		<latitude />
 		<longitude />
 		<provider>Unknown</provider>
@@ -543,8 +543,8 @@
 	</row>
 	<row>
 		<idSite>1</idSite>
-		<idVisit>14</idVisit>
-		<visitIp>1.2.4.6</visitIp>
+		<idVisit>30</idVisit>
+		<visitIp>113.62.1.1</visitIp>
 		
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
@@ -552,16 +552,16 @@
 		<visitConvertedIcon>plugins/Zeitgeist/images/goal.png</visitConvertedIcon>
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
-		<searches>1</searches>
+		<searches>0</searches>
 		<events>1</events>
-		<actions>3</actions>
+		<actions>2</actions>
 		<actionDetails>
 			<row>
 				<type>goal</type>
 				<goalName>all</goalName>
 				<goalId>1</goalId>
 				<revenue>5</revenue>
-				<goalPageId>23</goalPageId>
+				<goalPageId>52</goalPageId>
 				
 				<url>http://piwik.net/space/quest/iv</url>
 				<icon>plugins/Zeitgeist/images/goal.png</icon>
@@ -572,27 +572,10 @@
 				<pageTitle>Space Quest XII</pageTitle>
 				<pageIdAction>4</pageIdAction>
 				
-				<pageId>23</pageId>
-				<timeSpent>360</timeSpent>
-				<timeSpentPretty>6 min 0s</timeSpentPretty>
-				<icon />
-			</row>
-			<row>
-				<type>search</type>
-				<url />
-				<pageIdAction />
-				
-				<pageId>24</pageId>
-				<customVariables>
-					<row>
-						<customVariablePageName4>Search Category</customVariablePageName4>
-						<customVariablePageValue4>CAT</customVariablePageValue4>
-					</row>
-				</customVariables>
-				<siteSearchKeyword>Bring on the party</siteSearchKeyword>
+				<pageId>52</pageId>
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
-				<icon>plugins/Zeitgeist/images/search_ico.png</icon>
+				<icon />
 			</row>
 			<row>
 				<type>goal</type>
@@ -609,22 +592,22 @@
 				<url>http://piwik.net/space/quest/iv</url>
 				<pageIdAction>4</pageIdAction>
 				
-				<pageId>25</pageId>
-				<eventCategory>Cat6</eventCategory>
-				<eventAction>Action6</eventAction>
-				<eventName>Name6</eventName>
-				<eventValue>351.678</eventValue>
+				<pageId>53</pageId>
+				<eventCategory>Cat3</eventCategory>
+				<eventAction>Action3</eventAction>
+				<eventName>Name3</eventName>
+				<eventValue>348.678</eventValue>
 				<icon>plugins/Zeitgeist/images/event.png</icon>
 			</row>
 		</actionDetails>
 		<customVariables>
 			<row>
 				<customVariableName1>Cvar 1 name</customVariableName1>
-				<customVariableValue1>Cvar1 value is 6</customVariableValue1>
+				<customVariableValue1>Cvar1 value is 3</customVariableValue1>
 			</row>
 			<row>
 				<customVariableName5>Cvar 5 name</customVariableName5>
-				<customVariableValue5>Cvar5 value is 6</customVariableValue5>
+				<customVariableValue5>Cvar5 value is 3</customVariableValue5>
 			</row>
 		</customVariables>
 		<goalConversions>2</goalConversions>
@@ -643,17 +626,17 @@
 		<daysSinceLastVisit>10</daysSinceLastVisit>
 		<daysSinceFirstVisit>100</daysSinceFirstVisit>
 		<daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder>
-		<continent>Europe</continent>
-		<continentCode>eur</continentCode>
-		<country>Russian Federation</country>
-		<countryCode>ru</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/ru.png</countryFlag>
-		<region>Saint Petersburg City</region>
-		<regionCode>66</regionCode>
-		<city>Hluboká nad Vltavou</city>
-		<location>Hluboká nad Vltavou, Saint Petersburg City, Russian Federation</location>
-		<latitude />
-		<longitude />
+		<continent>Asia</continent>
+		<continentCode>asi</continentCode>
+		<country>Tibet</country>
+		<countryCode>ti</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/ti.png</countryFlag>
+		<region>Unknown</region>
+		<regionCode>1</regionCode>
+		<city>Lhasa</city>
+		<location>Lhasa, Unknown, Tibet</location>
+		<latitude>29.650000</latitude>
+		<longitude>91.099998</longitude>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
 		<providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl>
@@ -698,8 +681,8 @@
 	</row>
 	<row>
 		<idSite>1</idSite>
-		<idVisit>13</idVisit>
-		<visitIp>1.2.4.6</visitIp>
+		<idVisit>7</idVisit>
+		<visitIp>1.2.4.3</visitIp>
 		
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
@@ -716,7 +699,7 @@
 				<goalName>all</goalName>
 				<goalId>1</goalId>
 				<revenue>5</revenue>
-				<goalPageId>22</goalPageId>
+				<goalPageId>12</goalPageId>
 				
 				<url>http://piwik.net/grue/lair</url>
 				<icon>plugins/Zeitgeist/images/goal.png</icon>
@@ -727,15 +710,15 @@
 				<pageTitle>It&amp;#039;s &lt;script&gt; pitch black...</pageTitle>
 				<pageIdAction>2</pageIdAction>
 				
-				<pageId>22</pageId>
+				<pageId>12</pageId>
 				<customVariables>
 					<row>
 						<customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2>
-						<customVariablePageValue2>Cvar2 PAGE value is 6</customVariablePageValue2>
+						<customVariablePageValue2>Cvar2 PAGE value is 3</customVariablePageValue2>
 					</row>
 					<row>
 						<customVariablePageName5>Cvar 5 PAGE name</customVariablePageName5>
-						<customVariablePageValue5>Cvar5 PAGE value is 6</customVariablePageValue5>
+						<customVariablePageValue5>Cvar5 PAGE value is 3</customVariablePageValue5>
 					</row>
 				</customVariables>
 				<icon />
@@ -744,11 +727,11 @@
 		<customVariables>
 			<row>
 				<customVariableName1>Cvar 1 name</customVariableName1>
-				<customVariableValue1>Cvar1 value is 6</customVariableValue1>
+				<customVariableValue1>Cvar1 value is 3</customVariableValue1>
 			</row>
 			<row>
 				<customVariableName5>Cvar 5 name</customVariableName5>
-				<customVariableValue5>Cvar5 value is 6</customVariableValue5>
+				<customVariableValue5>Cvar5 value is 3</customVariableValue5>
 			</row>
 		</customVariables>
 		<goalConversions>1</goalConversions>
@@ -769,13 +752,13 @@
 		<daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
-		<country>Russian Federation</country>
-		<countryCode>ru</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/ru.png</countryFlag>
-		<region>Saint Petersburg City</region>
-		<regionCode>66</regionCode>
-		<city>Hluboká nad Vltavou</city>
-		<location>Hluboká nad Vltavou, Saint Petersburg City, Russian Federation</location>
+		<country>United Kingdom</country>
+		<countryCode>gb</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/gb.png</countryFlag>
+		<region>London, City of</region>
+		<regionCode>H9</regionCode>
+		<city>London</city>
+		<location>London, London, City of, United Kingdom</location>
 		<latitude />
 		<longitude />
 		<provider>Unknown</provider>
@@ -822,8 +805,8 @@
 	</row>
 	<row>
 		<idSite>1</idSite>
-		<idVisit>12</idVisit>
-		<visitIp>1.2.4.5</visitIp>
+		<idVisit>29</idVisit>
+		<visitIp>113.62.1.1</visitIp>
 		
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
@@ -832,64 +815,50 @@
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<searches>0</searches>
-		<events>1</events>
-		<actions>2</actions>
+		<events>0</events>
+		<actions>1</actions>
 		<actionDetails>
 			<row>
 				<type>goal</type>
 				<goalName>all</goalName>
 				<goalId>1</goalId>
 				<revenue>5</revenue>
-				<goalPageId>20</goalPageId>
+				<goalPageId>51</goalPageId>
 				
-				<url>http://piwik.net/space/quest/iv</url>
+				<url>http://piwik.net/grue/lair</url>
 				<icon>plugins/Zeitgeist/images/goal.png</icon>
 			</row>
 			<row>
 				<type>action</type>
-				<url>http://piwik.net/space/quest/iv</url>
-				<pageTitle>Space Quest XII</pageTitle>
-				<pageIdAction>4</pageIdAction>
+				<url>http://piwik.net/grue/lair</url>
+				<pageTitle>It&amp;#039;s &lt;script&gt; pitch black...</pageTitle>
+				<pageIdAction>2</pageIdAction>
 				
-				<pageId>20</pageId>
-				<timeSpent>180</timeSpent>
-				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<pageId>51</pageId>
+				<customVariables>
+					<row>
+						<customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2>
+						<customVariablePageValue2>Cvar2 PAGE value is 3</customVariablePageValue2>
+					</row>
+					<row>
+						<customVariablePageName5>Cvar 5 PAGE name</customVariablePageName5>
+						<customVariablePageValue5>Cvar5 PAGE value is 3</customVariablePageValue5>
+					</row>
+				</customVariables>
 				<icon />
 			</row>
-			<row>
-				<type>goal</type>
-				<goalName>two</goalName>
-				<goalId>2</goalId>
-				<revenue>5</revenue>
-				<goalPageId />
-				
-				<url>http://piwik.net/space/quest/iv</url>
-				<icon>plugins/Zeitgeist/images/goal.png</icon>
-			</row>
-			<row>
-				<type>event</type>
-				<url>http://piwik.net/space/quest/iv</url>
-				<pageIdAction>4</pageIdAction>
-				
-				<pageId>21</pageId>
-				<eventCategory>Cat5</eventCategory>
-				<eventAction>Action5</eventAction>
-				<eventName>Name5</eventName>
-				<eventValue>350.678</eventValue>
-				<icon>plugins/Zeitgeist/images/event.png</icon>
-			</row>
 		</actionDetails>
 		<customVariables>
 			<row>
 				<customVariableName1>Cvar 1 name</customVariableName1>
-				<customVariableValue1>Cvar1 value is 5</customVariableValue1>
+				<customVariableValue1>Cvar1 value is 3</customVariableValue1>
 			</row>
 			<row>
 				<customVariableName5>Cvar 5 name</customVariableName5>
-				<customVariableValue5>Cvar5 value is 5</customVariableValue5>
+				<customVariableValue5>Cvar5 value is 3</customVariableValue5>
 			</row>
 		</customVariables>
-		<goalConversions>2</goalConversions>
+		<goalConversions>1</goalConversions>
 		<siteCurrency>USD</siteCurrency>
 		<siteCurrencySymbol>$</siteCurrencySymbol>
 		
@@ -899,23 +868,23 @@
 		
 		
 		
-		<visitDuration>1262</visitDuration>
-		<visitDurationPretty>21 min 2s</visitDurationPretty>
+		<visitDuration>0</visitDuration>
+		<visitDurationPretty>0s</visitDurationPretty>
 		<visitCount>5</visitCount>
-		<daysSinceLastVisit>10</daysSinceLastVisit>
-		<daysSinceFirstVisit>100</daysSinceFirstVisit>
-		<daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder>
-		<continent>Europe</continent>
-		<continentCode>eur</continentCode>
-		<country>Russian Federation</country>
-		<countryCode>ru</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/ru.png</countryFlag>
-		<region>Saint Petersburg City</region>
-		<regionCode>66</regionCode>
-		<city>Stratford-upon-Avon</city>
-		<location>Stratford-upon-Avon, Saint Petersburg City, Russian Federation</location>
-		<latitude />
-		<longitude />
+		<daysSinceLastVisit>11</daysSinceLastVisit>
+		<daysSinceFirstVisit>101</daysSinceFirstVisit>
+		<daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder>
+		<continent>Asia</continent>
+		<continentCode>asi</continentCode>
+		<country>Tibet</country>
+		<countryCode>ti</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/ti.png</countryFlag>
+		<region>Unknown</region>
+		<regionCode>1</regionCode>
+		<city>Lhasa</city>
+		<location>Lhasa, Unknown, Tibet</location>
+		<latitude>29.650000</latitude>
+		<longitude>91.099998</longitude>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
 		<providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl>
@@ -960,8 +929,8 @@
 	</row>
 	<row>
 		<idSite>1</idSite>
-		<idVisit>11</idVisit>
-		<visitIp>1.2.4.5</visitIp>
+		<idVisit>6</idVisit>
+		<visitIp>1.2.4.2</visitIp>
 		
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
@@ -969,51 +938,82 @@
 		<visitConvertedIcon>plugins/Zeitgeist/images/goal.png</visitConvertedIcon>
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
-		<searches>0</searches>
-		<events>0</events>
-		<actions>1</actions>
+		<searches>1</searches>
+		<events>1</events>
+		<actions>3</actions>
 		<actionDetails>
 			<row>
 				<type>goal</type>
 				<goalName>all</goalName>
 				<goalId>1</goalId>
 				<revenue>5</revenue>
-				<goalPageId>19</goalPageId>
+				<goalPageId>9</goalPageId>
 				
-				<url>http://piwik.net/grue/lair</url>
+				<url>http://piwik.net/space/quest/iv</url>
 				<icon>plugins/Zeitgeist/images/goal.png</icon>
 			</row>
 			<row>
 				<type>action</type>
-				<url>http://piwik.net/grue/lair</url>
-				<pageTitle>It&amp;#039;s &lt;script&gt; pitch black...</pageTitle>
-				<pageIdAction>2</pageIdAction>
+				<url>http://piwik.net/space/quest/iv</url>
+				<pageTitle>Space Quest XII</pageTitle>
+				<pageIdAction>4</pageIdAction>
 				
-				<pageId>19</pageId>
+				<pageId>9</pageId>
+				<timeSpent>360</timeSpent>
+				<timeSpentPretty>6 min 0s</timeSpentPretty>
+				<icon />
+			</row>
+			<row>
+				<type>search</type>
+				<url />
+				<pageIdAction />
+				
+				<pageId>10</pageId>
 				<customVariables>
 					<row>
-						<customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2>
-						<customVariablePageValue2>Cvar2 PAGE value is 5</customVariablePageValue2>
-					</row>
-					<row>
-						<customVariablePageName5>Cvar 5 PAGE name</customVariablePageName5>
-						<customVariablePageValue5>Cvar5 PAGE value is 5</customVariablePageValue5>
+						<customVariablePageName4>Search Category</customVariablePageName4>
+						<customVariablePageValue4>CAT</customVariablePageValue4>
 					</row>
 				</customVariables>
-				<icon />
+				<siteSearchKeyword>Bring on the party</siteSearchKeyword>
+				<timeSpent>180</timeSpent>
+				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<icon>plugins/Zeitgeist/images/search_ico.png</icon>
+			</row>
+			<row>
+				<type>goal</type>
+				<goalName>two</goalName>
+				<goalId>2</goalId>
+				<revenue>5</revenue>
+				<goalPageId />
+				
+				<url>http://piwik.net/space/quest/iv</url>
+				<icon>plugins/Zeitgeist/images/goal.png</icon>
+			</row>
+			<row>
+				<type>event</type>
+				<url>http://piwik.net/space/quest/iv</url>
+				<pageIdAction>4</pageIdAction>
+				
+				<pageId>11</pageId>
+				<eventCategory>Cat2</eventCategory>
+				<eventAction>Action2</eventAction>
+				<eventName>Name2</eventName>
+				<eventValue>347.678</eventValue>
+				<icon>plugins/Zeitgeist/images/event.png</icon>
 			</row>
 		</actionDetails>
 		<customVariables>
 			<row>
 				<customVariableName1>Cvar 1 name</customVariableName1>
-				<customVariableValue1>Cvar1 value is 5</customVariableValue1>
+				<customVariableValue1>Cvar1 value is 2</customVariableValue1>
 			</row>
 			<row>
 				<customVariableName5>Cvar 5 name</customVariableName5>
-				<customVariableValue5>Cvar5 value is 5</customVariableValue5>
+				<customVariableValue5>Cvar5 value is 2</customVariableValue5>
 			</row>
 		</customVariables>
-		<goalConversions>1</goalConversions>
+		<goalConversions>2</goalConversions>
 		<siteCurrency>USD</siteCurrency>
 		<siteCurrencySymbol>$</siteCurrencySymbol>
 		
@@ -1023,26 +1023,26 @@
 		
 		
 		
-		<visitDuration>0</visitDuration>
-		<visitDurationPretty>0s</visitDurationPretty>
+		<visitDuration>1262</visitDuration>
+		<visitDurationPretty>21 min 2s</visitDurationPretty>
 		<visitCount>5</visitCount>
-		<daysSinceLastVisit>11</daysSinceLastVisit>
-		<daysSinceFirstVisit>101</daysSinceFirstVisit>
-		<daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder>
+		<daysSinceLastVisit>10</daysSinceLastVisit>
+		<daysSinceFirstVisit>100</daysSinceFirstVisit>
+		<daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
-		<country>Russian Federation</country>
-		<countryCode>ru</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/ru.png</countryFlag>
-		<region>Saint Petersburg City</region>
-		<regionCode>66</regionCode>
+		<country>United Kingdom</country>
+		<countryCode>gb</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/gb.png</countryFlag>
+		<region>Warwickshire</region>
+		<regionCode>P3</regionCode>
 		<city>Stratford-upon-Avon</city>
-		<location>Stratford-upon-Avon, Saint Petersburg City, Russian Federation</location>
-		<latitude />
-		<longitude />
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl>
+		<location>Stratford-upon-Avon, Warwickshire, United Kingdom</location>
+		<latitude>124.456001</latitude>
+		<longitude>22.231001</longitude>
+		<provider>comcast.net</provider>
+		<providerName>Comcast</providerName>
+		<providerUrl>http://www.comcast.net/</providerUrl>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -1084,8 +1084,8 @@
 	</row>
 	<row>
 		<idSite>1</idSite>
-		<idVisit>10</idVisit>
-		<visitIp>1.2.4.4</visitIp>
+		<idVisit>28</idVisit>
+		<visitIp>2001:db8:85a3::8a2e:370:7334</visitIp>
 		
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
@@ -1102,7 +1102,7 @@
 				<goalName>all</goalName>
 				<goalId>1</goalId>
 				<revenue>5</revenue>
-				<goalPageId>16</goalPageId>
+				<goalPageId>48</goalPageId>
 				
 				<url>http://piwik.net/space/quest/iv</url>
 				<icon>plugins/Zeitgeist/images/goal.png</icon>
@@ -1113,7 +1113,7 @@
 				<pageTitle>Space Quest XII</pageTitle>
 				<pageIdAction>4</pageIdAction>
 				
-				<pageId>16</pageId>
+				<pageId>48</pageId>
 				<timeSpent>360</timeSpent>
 				<timeSpentPretty>6 min 0s</timeSpentPretty>
 				<icon />
@@ -1123,7 +1123,7 @@
 				<url />
 				<pageIdAction />
 				
-				<pageId>17</pageId>
+				<pageId>49</pageId>
 				<customVariables>
 					<row>
 						<customVariablePageName4>Search Category</customVariablePageName4>
@@ -1150,22 +1150,22 @@
 				<url>http://piwik.net/space/quest/iv</url>
 				<pageIdAction>4</pageIdAction>
 				
-				<pageId>18</pageId>
-				<eventCategory>Cat4</eventCategory>
-				<eventAction>Action4</eventAction>
-				<eventName>Name4</eventName>
-				<eventValue>349.678</eventValue>
+				<pageId>50</pageId>
+				<eventCategory>Cat2</eventCategory>
+				<eventAction>Action2</eventAction>
+				<eventName>Name2</eventName>
+				<eventValue>347.678</eventValue>
 				<icon>plugins/Zeitgeist/images/event.png</icon>
 			</row>
 		</actionDetails>
 		<customVariables>
 			<row>
 				<customVariableName1>Cvar 1 name</customVariableName1>
-				<customVariableValue1>Cvar1 value is 4</customVariableValue1>
+				<customVariableValue1>Cvar1 value is 2</customVariableValue1>
 			</row>
 			<row>
 				<customVariableName5>Cvar 5 name</customVariableName5>
-				<customVariableValue5>Cvar5 value is 4</customVariableValue5>
+				<customVariableValue5>Cvar5 value is 2</customVariableValue5>
 			</row>
 		</customVariables>
 		<goalConversions>2</goalConversions>
@@ -1186,18 +1186,18 @@
 		<daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
-		<country>United Kingdom</country>
-		<countryCode>gb</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/gb.png</countryFlag>
-		<region>Kent</region>
-		<regionCode>G5</regionCode>
-		<city>Stratford-upon-Avon</city>
-		<location>Stratford-upon-Avon, Kent, United Kingdom</location>
+		<country>France</country>
+		<countryCode>fr</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag>
+		<region />
+		<regionCode />
+		<city />
+		<location>France</location>
 		<latitude />
 		<longitude />
-		<provider>awesomeisp.com</provider>
-		<providerName>Awesomeisp</providerName>
-		<providerUrl>http://www.awesomeisp.com/</providerUrl>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -1239,8 +1239,8 @@
 	</row>
 	<row>
 		<idSite>1</idSite>
-		<idVisit>9</idVisit>
-		<visitIp>1.2.4.4</visitIp>
+		<idVisit>5</idVisit>
+		<visitIp>1.2.4.2</visitIp>
 		
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
@@ -1257,7 +1257,7 @@
 				<goalName>all</goalName>
 				<goalId>1</goalId>
 				<revenue>5</revenue>
-				<goalPageId>15</goalPageId>
+				<goalPageId>8</goalPageId>
 				
 				<url>http://piwik.net/grue/lair</url>
 				<icon>plugins/Zeitgeist/images/goal.png</icon>
@@ -1268,15 +1268,15 @@
 				<pageTitle>It&amp;#039;s &lt;script&gt; pitch black...</pageTitle>
 				<pageIdAction>2</pageIdAction>
 				
-				<pageId>15</pageId>
+				<pageId>8</pageId>
 				<customVariables>
 					<row>
 						<customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2>
-						<customVariablePageValue2>Cvar2 PAGE value is 4</customVariablePageValue2>
+						<customVariablePageValue2>Cvar2 PAGE value is 2</customVariablePageValue2>
 					</row>
 					<row>
 						<customVariablePageName5>Cvar 5 PAGE name</customVariablePageName5>
-						<customVariablePageValue5>Cvar5 PAGE value is 4</customVariablePageValue5>
+						<customVariablePageValue5>Cvar5 PAGE value is 2</customVariablePageValue5>
 					</row>
 				</customVariables>
 				<icon />
@@ -1285,11 +1285,11 @@
 		<customVariables>
 			<row>
 				<customVariableName1>Cvar 1 name</customVariableName1>
-				<customVariableValue1>Cvar1 value is 4</customVariableValue1>
+				<customVariableValue1>Cvar1 value is 2</customVariableValue1>
 			</row>
 			<row>
 				<customVariableName5>Cvar 5 name</customVariableName5>
-				<customVariableValue5>Cvar5 value is 4</customVariableValue5>
+				<customVariableValue5>Cvar5 value is 2</customVariableValue5>
 			</row>
 		</customVariables>
 		<goalConversions>1</goalConversions>
@@ -1313,15 +1313,15 @@
 		<country>United Kingdom</country>
 		<countryCode>gb</countryCode>
 		<countryFlag>plugins/UserCountry/images/flags/gb.png</countryFlag>
-		<region>Kent</region>
-		<regionCode>G5</regionCode>
+		<region>Warwickshire</region>
+		<regionCode>P3</regionCode>
 		<city>Stratford-upon-Avon</city>
-		<location>Stratford-upon-Avon, Kent, United Kingdom</location>
-		<latitude />
-		<longitude />
-		<provider>awesomeisp.com</provider>
-		<providerName>Awesomeisp</providerName>
-		<providerUrl>http://www.awesomeisp.com/</providerUrl>
+		<location>Stratford-upon-Avon, Warwickshire, United Kingdom</location>
+		<latitude>124.456001</latitude>
+		<longitude>22.231001</longitude>
+		<provider>comcast.net</provider>
+		<providerName>Comcast</providerName>
+		<providerUrl>http://www.comcast.net/</providerUrl>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
diff --git a/tests/PHPUnit/UI b/tests/PHPUnit/UI
index 3bf6df6e1c23d653930253da13d728021f0b095e..af8a43f8c50ce919e2a36f002bab56724e220a69 160000
--- a/tests/PHPUnit/UI
+++ b/tests/PHPUnit/UI
@@ -1 +1 @@
-Subproject commit 3bf6df6e1c23d653930253da13d728021f0b095e
+Subproject commit af8a43f8c50ce919e2a36f002bab56724e220a69