Merge master into "3.0"

Conflicts:
	.travis.yml
	CHANGELOG.md
	core/Plugin/ControllerAdmin.php
	core/Version.php
	core/testMinimumPhpVersion.php
	plugins/API/API.php
	plugins/Actions/Reports/GetPageUrls.php
	plugins/AnonymousPiwikUsageMeasurement
	plugins/CoreHome/CoreHome.php
	plugins/CoreHome/templates/_menu.twig
	plugins/CoreVisualizations/javascripts/jqplotEvolutionGraph.js
	plugins/CustomVariables/tests/System/expected/test_CustomVariablesSystemTest__CustomVariables.getCustomVariables_day.xml
	plugins/Goals/Controller.php
	tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php
	tests/PHPUnit/Integration/Plugin/ManagerTest.php
	tests/PHPUnit/System/expected/test_FlattenReports__CustomVariables.getCustomVariables_day.xml
	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.getSegmentsMetadata.xml
	tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html
	tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__CustomVariables.getCustomVariables_range.xml
	tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__CustomVariables.getCustomVariables_range.xml
	tests/PHPUnit/System/expected/test_reportLimiting__CustomVariables.getCustomVariables_day.xml
	tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__CustomVariables.getCustomVariables_day.xml
	tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__CustomVariables.getCustomVariables_day.xml
	tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__CustomVariables.getCustomVariables_week.xml
	tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__CustomVariables.getCustomVariables_day.xml
	tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__CustomVariables.getCustomVariables_week.xml
	tests/UI/expected-ui-screenshots
	tests/UI/specs/Overlay_spec.js
	tests/UI/specs/UIIntegration_spec.js

4 files changed, 24 insertions, 3 deletions

diff --git a/plugins/Contents/lang/cs.json b/plugins/Contents/lang/cs.json
index 596ee07a03..7cbe4e4488 100644
--- a/plugins/Contents/lang/cs.json
+++ b/plugins/Contents/lang/cs.json
@@ -8,6 +8,9 @@
         "ContentName": "Jméno obsahu",
         "ContentPiece": "Část obsahu",
         "ContentTarget": "Cíl obsahu",
-        "Contents": "Obsah"
+        "Contents": "Obsah",
+        "InteractionsMetricDocumentation": "Kolikrát bylo s blokem obsahu interagováno (t. j. kliknuto na banner nebo reklamu).",
+        "ImpressionsMetricDocumentation": "Počet zobrazení banneru nebo reklamy na stránkách.",
+        "InteractionRateMetricDocumentation": "Poměr impresí obsahu k interakcím."
     }
 }
\ No newline at end of file
diff --git a/plugins/Contents/lang/de.json b/plugins/Contents/lang/de.json
index cc42a8d6bb..61cb4074fa 100644
--- a/plugins/Contents/lang/de.json
+++ b/plugins/Contents/lang/de.json
@@ -8,6 +8,9 @@
         "ContentName": "Inhaltsname",
         "ContentPiece": "Inhaltsteil",
         "ContentTarget": "Inhaltsziel",
-        "Contents": "Inhalte"
+        "Contents": "Inhalte",
+        "InteractionsMetricDocumentation": "Die Anzahl, wie häufig mit einem Inhalt interagiert wurde (z.B. durch einen Klick auf ein Banner oder eine Anzeige).",
+        "ImpressionsMetricDocumentation": "Die Anzahl, wie häufig ein Inhalt, z.b. ein Banner oder eine Anzeige, auf der Seite angezeigt wurden.",
+        "InteractionRateMetricDocumentation": "Verhältnis zwischen Impressionen des Inhalts und Interaktionen."
     }
 }
\ No newline at end of file
diff --git a/plugins/Contents/lang/ja.json b/plugins/Contents/lang/ja.json
index 56af2f6ea7..a15de7b042 100644
--- a/plugins/Contents/lang/ja.json
+++ b/plugins/Contents/lang/ja.json
@@ -1,5 +1,6 @@
 {
     "Contents": {
+        "PluginDescription": "コンテンツやバナーの追跡では、ページのコンテンツの任意の部分(バナー広告、イメージ、任意項目) のパフォーマンス(ビュー、クリック数、CTR )を測定できます。",
         "Impressions": "インプレッション",
         "Interactions": "インタラクション",
         "Interaction": "インタラクション",
@@ -7,6 +8,9 @@
         "ContentName": "コンテンツ名",
         "ContentPiece": "コンテンツ要素",
         "ContentTarget": "コンテンツターゲット",
-        "Contents": "内容"
+        "Contents": "内容",
+        "InteractionsMetricDocumentation": "( 例えば、バナーや広告を「クリック」というような ) 相互作用をコンテンツブロックが受けた回数。",
+        "ImpressionsMetricDocumentation": "広告やバナーなどのコンテンツブロックがページに表示された回数。",
+        "InteractionRateMetricDocumentation": "相互作用に対するコンテンツの表示回数の比率。"
     }
 }
\ No newline at end of file
diff --git a/plugins/Contents/lang/ko.json b/plugins/Contents/lang/ko.json
new file mode 100644
index 0000000000..121856bf06
--- /dev/null
+++ b/plugins/Contents/lang/ko.json
@@ -0,0 +1,11 @@
+{
+    "Contents": {
+        "Interactions": "상호 작용들",
+        "Interaction": "상호 작용",
+        "InteractionRate": "상호 작용 비율",
+        "ContentName": "콘텐츠 이름",
+        "ContentPiece": "콘텐츠 조각",
+        "ContentTarget": "콘텐츠 목표",
+        "Contents": "콘텐츠"
+    }
+}
\ No newline at end of file