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

6 files changed, 10 insertions, 4 deletions

diff --git a/plugins/SEO/Metric/Alexa.php b/plugins/SEO/Metric/Alexa.php
index 87c5785d36..e8f7956241 100644
--- a/plugins/SEO/Metric/Alexa.php
+++ b/plugins/SEO/Metric/Alexa.php
@@ -10,6 +10,7 @@ namespace Piwik\Plugins\SEO\Metric;
 
 use Piwik\Http;
 use Piwik\NumberFormatter;
+use Piwik\Plugins\Referrers\SearchEngine;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -42,7 +43,7 @@ class Alexa implements MetricsProvider
             $value = null;
         }
 
-        $logo = \Piwik\Plugins\Referrers\getSearchEngineLogoFromUrl('http://alexa.com');
+        $logo = SearchEngine::getInstance()->getLogoFromUrl('http://alexa.com');
         $link = self::LINK . urlencode($domain);
 
         return array(
diff --git a/plugins/SEO/Metric/Bing.php b/plugins/SEO/Metric/Bing.php
index e85d585c13..71553ffc6e 100644
--- a/plugins/SEO/Metric/Bing.php
+++ b/plugins/SEO/Metric/Bing.php
@@ -10,6 +10,7 @@ namespace Piwik\Plugins\SEO\Metric;
 
 use Piwik\Http;
 use Piwik\NumberFormatter;
+use Piwik\Plugins\Referrers\SearchEngine;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -46,7 +47,7 @@ class Bing implements MetricsProvider
             $pageCount = null;
         }
 
-        $logo = \Piwik\Plugins\Referrers\getSearchEngineLogoFromUrl('http://bing.com');
+        $logo = SearchEngine::getInstance()->getLogoFromUrl('http://bing.com');
 
         return array(
             new Metric('bing-index', 'SEO_Bing_IndexedPages', $pageCount, $logo, null, null, 'General_Pages')
diff --git a/plugins/SEO/Metric/Dmoz.php b/plugins/SEO/Metric/Dmoz.php
index d21be1e5ca..c7b8860a89 100644
--- a/plugins/SEO/Metric/Dmoz.php
+++ b/plugins/SEO/Metric/Dmoz.php
@@ -10,6 +10,7 @@ namespace Piwik\Plugins\SEO\Metric;
 
 use Piwik\Http;
 use Piwik\NumberFormatter;
+use Piwik\Plugins\Referrers\SearchEngine;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -53,7 +54,7 @@ class Dmoz implements MetricsProvider
             $value = null;
         }
 
-        $logo = \Piwik\Plugins\Referrers\getSearchEngineLogoFromUrl('http://dmoz.org');
+        $logo = SearchEngine::getInstance()->getLogoFromUrl('http://dmoz.org');
 
         return array(
             new Metric('dmoz', 'SEO_Dmoz', $value, $logo)
diff --git a/plugins/SEO/Metric/Google.php b/plugins/SEO/Metric/Google.php
index cec1d96af9..7abd82b371 100644
--- a/plugins/SEO/Metric/Google.php
+++ b/plugins/SEO/Metric/Google.php
@@ -10,6 +10,7 @@ namespace Piwik\Plugins\SEO\Metric;
 
 use Piwik\Http;
 use Piwik\NumberFormatter;
+use Piwik\Plugins\Referrers\SearchEngine;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -37,7 +38,7 @@ class Google implements MetricsProvider
         $pageCount = $this->fetchIndexedPagesCount($domain);
         $pageRank = $this->fetchPageRank($domain);
 
-        $logo = \Piwik\Plugins\Referrers\getSearchEngineLogoFromUrl('http://google.com');
+        $logo = SearchEngine::getInstance()->getLogoFromUrl('http://google.com');
 
         return array(
             new Metric('google-index', 'SEO_Google_IndexedPages', $pageCount, $logo, null, null, 'General_Pages'),
diff --git a/plugins/SEO/lang/ja.json b/plugins/SEO/lang/ja.json
index e0496470df..e4459709a2 100644
--- a/plugins/SEO/lang/ja.json
+++ b/plugins/SEO/lang/ja.json
@@ -1,5 +1,6 @@
 {
     "SEO": {
+        "PluginDescription": "このプラグインは SEO メトリクスを抽出し、表示します。： Alexa web ランキング, Google ページランク,インデックスされたページ数やバックリンクの数。",
         "AlexaRank": "Alexa ランク",
         "Bing_IndexedPages": "Bing インデックスページ",
         "Dmoz": "DMOZ エントリー",
diff --git a/plugins/SEO/lang/ko.json b/plugins/SEO/lang/ko.json
index 55f71074cb..de4e2b2bd6 100644
--- a/plugins/SEO/lang/ko.json
+++ b/plugins/SEO/lang/ko.json
@@ -1,5 +1,6 @@
 {
     "SEO": {
+        "PluginDescription": "이 플러그인은 Alexa 웹 랭킹, 구글 페이지랭크, 색인된 페이지 수, 선택된 웹사이트의 백링크와 같은 SEO 측정 기준을 추출하고 보여줍니다.",
         "AlexaRank": "Alexa 랭크",
         "Bing_IndexedPages": "Bing에 색인된 페이지",
         "Dmoz": "DMOZ 항목",