Merge branch 'master' into 3.0-m06

Conflicts:
	.travis.yml
	bower.json
	core/Notification/Manager.php
	core/Updates.php
	core/Updates/2.16.2-b2.php
	core/Version.php
	libs/Zend/Validate/Hostname.php
	libs/bower_components/jScrollPane/ajax.html
	libs/bower_components/jScrollPane/anchors.html
	libs/bower_components/jScrollPane/api.html
	libs/bower_components/jScrollPane/arrow_hover.html
	libs/bower_components/jScrollPane/arrow_positions.html
	libs/bower_components/jScrollPane/arrows.html
	libs/bower_components/jScrollPane/auto_reinitialise.html
	libs/bower_components/jScrollPane/basic.html
	libs/bower_components/jScrollPane/caps.html
	libs/bower_components/jScrollPane/changelog.html
	libs/bower_components/jScrollPane/destroy.html
	libs/bower_components/jScrollPane/drag_size.html
	libs/bower_components/jScrollPane/dynamic_content.html
	libs/bower_components/jScrollPane/dynamic_height.html
	libs/bower_components/jScrollPane/dynamic_width.html
	libs/bower_components/jScrollPane/events.html
	libs/bower_components/jScrollPane/faqs.html
	libs/bower_components/jScrollPane/fixed_width.html
	libs/bower_components/jScrollPane/focus.html
	libs/bower_components/jScrollPane/fullpage_scroll.html
	libs/bower_components/jScrollPane/iframe.html
	libs/bower_components/jScrollPane/iframe2.html
	libs/bower_components/jScrollPane/iframe_content1.html
	libs/bower_components/jScrollPane/iframe_content2.html
	libs/bower_components/jScrollPane/image.html
	libs/bower_components/jScrollPane/image2.html
	libs/bower_components/jScrollPane/index.html
	libs/bower_components/jScrollPane/invisibles.html
	libs/bower_components/jScrollPane/known_issues.html
	libs/bower_components/jScrollPane/less_basic.html
	libs/bower_components/jScrollPane/mwheel_intent.html
	libs/bower_components/jScrollPane/override_animate.html
	libs/bower_components/jScrollPane/runeimp.html
	libs/bower_components/jScrollPane/runeimp2.html
	libs/bower_components/jScrollPane/scroll_on_left.html
	libs/bower_components/jScrollPane/scroll_to.html
	libs/bower_components/jScrollPane/scroll_to_animate.html
	libs/bower_components/jScrollPane/settings.html
	libs/bower_components/jScrollPane/short.html
	libs/bower_components/jquery/.bower.json
	libs/bower_components/jquery/LICENSE.txt
	libs/bower_components/jquery/dist/jquery.js
	libs/bower_components/jquery/dist/jquery.min.js
	libs/bower_components/jquery/dist/jquery.min.map
	libs/bower_components/jquery/sizzle/dist/sizzle.js
	libs/bower_components/jquery/src/ajax.js
	libs/bower_components/jquery/src/ajax/jsonp.js
	libs/bower_components/jquery/src/ajax/load.js
	libs/bower_components/jquery/src/ajax/parseJSON.js
	libs/bower_components/jquery/src/ajax/parseXML.js
	libs/bower_components/jquery/src/ajax/script.js
	libs/bower_components/jquery/src/ajax/xhr.js
	libs/bower_components/jquery/src/attributes/attr.js
	libs/bower_components/jquery/src/attributes/classes.js
	libs/bower_components/jquery/src/attributes/prop.js
	libs/bower_components/jquery/src/attributes/support.js
	libs/bower_components/jquery/src/attributes/val.js
	libs/bower_components/jquery/src/callbacks.js
	libs/bower_components/jquery/src/core.js
	libs/bower_components/jquery/src/core/access.js
	libs/bower_components/jquery/src/core/init.js
	libs/bower_components/jquery/src/core/parseHTML.js
	libs/bower_components/jquery/src/core/ready.js
	libs/bower_components/jquery/src/css.js
	libs/bower_components/jquery/src/css/curCSS.js
	libs/bower_components/jquery/src/css/hiddenVisibleSelectors.js
	libs/bower_components/jquery/src/css/support.js
	libs/bower_components/jquery/src/css/var/swap.js
	libs/bower_components/jquery/src/data.js
	libs/bower_components/jquery/src/data/accepts.js
	libs/bower_components/jquery/src/deferred.js
	libs/bower_components/jquery/src/deprecated.js
	libs/bower_components/jquery/src/dimensions.js
	libs/bower_components/jquery/src/effects.js
	libs/bower_components/jquery/src/effects/Tween.js
	libs/bower_components/jquery/src/event.js
	libs/bower_components/jquery/src/event/support.js
	libs/bower_components/jquery/src/manipulation.js
	libs/bower_components/jquery/src/manipulation/support.js
	libs/bower_components/jquery/src/offset.js
	libs/bower_components/jquery/src/queue.js
	libs/bower_components/jquery/src/serialize.js
	libs/bower_components/jquery/src/traversing.js
	libs/bower_components/jquery/src/traversing/findFilter.js
	libs/bower_components/jquery/src/var/concat.js
	libs/bower_components/jquery/src/var/indexOf.js
	libs/bower_components/jquery/src/var/push.js
	libs/bower_components/jquery/src/var/slice.js
	libs/bower_components/jquery/src/wrap.js
	plugins/API/ProcessedReport.php
	plugins/AnonymousPiwikUsageMeasurement
	plugins/CoreConsole/Commands/ManagePlugin.php
	plugins/CoreHome/javascripts/dataTable.js
	plugins/CoreHome/javascripts/manifest.json
	plugins/CoreHome/templates/_topBar.twig
	plugins/CoreUpdater/templates/updateSuccess.twig
	plugins/CustomAlerts
	plugins/CustomDimensions
	plugins/DevicesDetection/Reports/GetBrowserVersions.php
	plugins/DevicesDetection/Reports/GetBrowsers.php
	plugins/ExamplePlugin/Updates/0.0.2.php
	plugins/Feedback/templates/index.twig
	plugins/LogViewer
	plugins/Morpheus/stylesheets/general/_forms.less
	plugins/Morpheus/templates/layout.twig
	plugins/Morpheus/templates/user.twig
	plugins/QueuedTracking
	plugins/SegmentEditor/stylesheets/segmentation.less
	plugins/SitesManager/tests/Integration/ApiTest.php
	tests/PHPUnit/Integration/WidgetsListTest.php
	tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric__API.getProcessedReport_day.xml
	tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_hideColumns___API.getProcessedReport_day.xml
	tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_showColumns___API.getProcessedReport_day.xml
	tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv
	tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html
	tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml
	tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv
	tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html
	tests/UI/expected-ui-screenshots
	tests/UI/specs/SegmentSelectorEditor_spec.js

6 files changed, 25 insertions, 4 deletions

diff --git a/plugins/Diagnostics/Test/Integration/Commands/AnalyzeArchiveTableTest.php b/plugins/Diagnostics/Test/Integration/Commands/AnalyzeArchiveTableTest.php
index a60f0c0a19..6202bd22af 100644
--- a/plugins/Diagnostics/Test/Integration/Commands/AnalyzeArchiveTableTest.php
+++ b/plugins/Diagnostics/Test/Integration/Commands/AnalyzeArchiveTableTest.php
@@ -41,12 +41,12 @@ Statistics for the archive_numeric_2010_03 and archive_blob_2010_03 tables:
 +-------------------------------------------+------------+---------------+-------------+---------+-----------+----------------+-------------+
 | Group                                     | # Archives | # Invalidated | # Temporary | # Error | # Segment | # Numeric Rows | # Blob Rows |
 +-------------------------------------------+------------+---------------+-------------+---------+-----------+----------------+-------------+
-| week[2010-03-01 - 2010-03-07] idSite = 1  | 3          | 0             | 0           | 0       | 2         | 36             | 63          |
-| month[2010-03-01 - 2010-03-31] idSite = 1 | 3          | 0             | 0           | 0       | 2         | 36             | 63          |
+| week[2010-03-01 - 2010-03-07] idSite = 1  | 3          | 0             | 0           | 0       | 2         | 36             | 64          |
+| month[2010-03-01 - 2010-03-31] idSite = 1 | 3          | 0             | 0           | 0       | 2         | 36             | 64          |
 | day[2010-03-03 - 2010-03-03] idSite = 1   | 3          | 0             | 0           | 0       | 2         | 0              | 0           |
 | day[2010-03-04 - 2010-03-04] idSite = 1   | 3          | 0             | 0           | 0       | 2         | 0              | 0           |
 | day[2010-03-05 - 2010-03-05] idSite = 1   | 3          | 0             | 0           | 0       | 2         | 0              | 0           |
-| day[2010-03-06 - 2010-03-06] idSite = 1   | 3          | 0             | 0           | 0       | 2         | 36             | 51          |
+| day[2010-03-06 - 2010-03-06] idSite = 1   | 3          | 0             | 0           | 0       | 2         | 36             | 52          |
 | day[2010-03-07 - 2010-03-07] idSite = 1   | 3          | 0             | 0           | 0       | 2         | 0              | 0           |
 | day[2010-03-08 - 2010-03-08] idSite = 1   | 3          | 0             | 0           | 0       | 2         | 0              | 0           |
 | week[2010-03-08 - 2010-03-14] idSite = 1  | 3          | 0             | 0           | 0       | 2         | 0              | 0           |
diff --git a/plugins/Diagnostics/lang/fr.json b/plugins/Diagnostics/lang/fr.json
index ffd3cffae6..5050b5a996 100644
--- a/plugins/Diagnostics/lang/fr.json
+++ b/plugins/Diagnostics/lang/fr.json
@@ -1,6 +1,8 @@
 {
     "Diagnostics": {
         "ConfigFileTitle": "Fichier de configuration",
+        "ConfigFileIntroduction": "Ici vous pouvez visualiser la configuration de Piwik. Si vous exécutez Piwik depuis un environnement où la charge est répartie, la page peut être différente dépedamment du serveur depuis lequel la page est chargée. Les lignes avec une couleur de fond différentes représentent les valeurs de configuration modifiées qui sont spécifiées par exemple dans le fichier %1$s.",
+        "HideUnchanged": "Si vous souhaitez afficher uniquement les valeurs modifiées, vous pouvez cliquer sur %1$smasquer toutes les valeurs inchangées%2$s.",
         "Sections": "Sections"
     }
 }
\ No newline at end of file
diff --git a/plugins/Diagnostics/lang/nb.json b/plugins/Diagnostics/lang/nb.json
index 47a69e3d91..4360976279 100644
--- a/plugins/Diagnostics/lang/nb.json
+++ b/plugins/Diagnostics/lang/nb.json
@@ -1,6 +1,8 @@
 {
     "Diagnostics": {
         "ConfigFileTitle": "Konfigurasjonsfil",
+        "ConfigFileIntroduction": "Her kan du se konfigurasjonen til Piwik. Hvis du kjører Piwik i et lastbalansert servermiljø, kan denne siden se ulik ut avhengig av hvilken server siden lastes fra. Rader med ulik bakgrunnsfarge er endrede konfigurasjonsverdier som er spesifisert i for eksempel %1$s.",
+        "HideUnchanged": "Hvis du kun vil se de endrede verdiene, kan du %1$sskjule alle uendrede verdier%2$s.",
         "Sections": "Seksjoner"
     }
 }
\ No newline at end of file
diff --git a/plugins/Diagnostics/lang/nl.json b/plugins/Diagnostics/lang/nl.json
new file mode 100644
index 0000000000..15f12486b5
--- /dev/null
+++ b/plugins/Diagnostics/lang/nl.json
@@ -0,0 +1,6 @@
+{
+    "Diagnostics": {
+        "ConfigFileTitle": "Configuratiebestand",
+        "Sections": "Secties"
+    }
+}
\ No newline at end of file
diff --git a/plugins/Diagnostics/lang/sv.json b/plugins/Diagnostics/lang/sv.json
index 25fe2ba0c6..aa04dc4e7b 100644
--- a/plugins/Diagnostics/lang/sv.json
+++ b/plugins/Diagnostics/lang/sv.json
@@ -1,5 +1,8 @@
 {
     "Diagnostics": {
-        "ConfigFileTitle": "Konfigurationsfil"
+        "ConfigFileTitle": "Konfigurationsfil",
+        "ConfigFileIntroduction": "Här kan du se Piwiks konfiguration. Om du kör Piwik i en lastbalanserad miljö så kan sidan se annorlunda ut beroende på vilken server som sidan laddas ifrån. De rader som har en annorlunda bakgrundsfärg är ändrade konfigurationsvärden som specificeras i exempelvis filen %1$s.",
+        "HideUnchanged": "Om du vill se endast ändrade värden så kan du %1$s dölja alla oförändrade värden%2$s.",
+        "Sections": "Sektioner"
     }
 }
\ No newline at end of file
diff --git a/plugins/Diagnostics/lang/uk.json b/plugins/Diagnostics/lang/uk.json
new file mode 100644
index 0000000000..41ff95413c
--- /dev/null
+++ b/plugins/Diagnostics/lang/uk.json
@@ -0,0 +1,8 @@
+{
+    "Diagnostics": {
+        "ConfigFileTitle": "Файл конфігурації",
+        "ConfigFileIntroduction": "Тут ви можете подивитися конфігурацію Piwik. Якщо ви запускаєте Piwik в середовищі зі збалансованим навантаження, сторінка може бути різною в залежності від сервера, з якого ця сторінка завантажується. Ряди з різними кольорами фону - це змінені значення конфігурації, які описані, наприклад в файлі %1$s.",
+        "HideUnchanged": "Якщо ви хочете бачити тільки змінені значення, ви можете %1$sзаховати всі незмінені значення%2$s.",
+        "Sections": "Розділи"
+    }
+}
\ No newline at end of file