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

3 files changed, 23 insertions, 4 deletions

diff --git a/plugins/Events/Actions/ActionEvent.php b/plugins/Events/Actions/ActionEvent.php
index 9921c8d39b..5106ec6092 100644
--- a/plugins/Events/Actions/ActionEvent.php
+++ b/plugins/Events/Actions/ActionEvent.php
@@ -60,9 +60,17 @@ class ActionEvent extends Action
 
     protected function getActionsToLookup()
     {
-        return array(
-            'idaction_url' => $this->getUrlAndType()
-        );
+        $actionUrl = false;
+
+        $url = $this->getActionUrl();
+
+        if (!empty($url)) {
+            // normalize urls by stripping protocol and www
+            $url = Tracker\PageUrl::normalizeUrl($url);
+            $actionUrl = array($url['url'], $this->getActionType(), $url['prefixId']);
+        }
+
+        return array('idaction_url' => $actionUrl);
     }
 
     // Do not track this Event URL as Entry/Exit Page URL (leave the existing entry/exit)
diff --git a/plugins/Events/lang/ja.json b/plugins/Events/lang/ja.json
index 4304953ddf..10051096aa 100644
--- a/plugins/Events/lang/ja.json
+++ b/plugins/Events/lang/ja.json
@@ -1,5 +1,6 @@
 {
     "Events": {
+        "PluginDescription": "イベントを追跡し、ビジターアクティビティのレポートを取得します。",
         "AvgEventValue": "イベントの平均値: %s",
         "AvgValue": "平均値",
         "AvgValueDocumentation": "このイベントのすべての値の平均値",
@@ -14,6 +15,7 @@
         "EventsWithValue": "値を持つイベント",
         "EventsWithValueDocumentation": "イベントの値が設定されたイベント数",
         "EventValue": "イベントの値",
+        "EventValueTooltip": "総イベント値は %s 件のイベント値の合計です。 %s 最小値は %s 、最大値は %s です 。",
         "MaxValue": "最大値",
         "MaxValueDocumentation": "このイベントの最大値",
         "MinValue": "最小値",
diff --git a/plugins/Events/lang/sk.json b/plugins/Events/lang/sk.json
index 396cf2c319..a45b722eb4 100644
--- a/plugins/Events/lang/sk.json
+++ b/plugins/Events/lang/sk.json
@@ -1,5 +1,14 @@
 {
     "Events": {
-        "AvgValue": "Priemerná hodnota"
+        "PluginDescription": "Sledovanie Udalostí a získanie reportu ohľadom aktivity vašich návštevníkov.",
+        "AvgValue": "Priemerná hodnota",
+        "Events": "Udalosti",
+        "EventsWithValue": "Udalosti s hodnotou",
+        "EventsWithValueDocumentation": "Počet udalostí, kde bola nastavená hodnota Udalosti",
+        "EventValueTooltip": "Hodnota Udalostí celom je suma %s hodnôt udalostí %s medzi minimom %s a maximom %s.",
+        "TopEvents": "Top Udalosti",
+        "TotalEvents": "Udalosti celkom",
+        "TotalEventsDocumentation": "Celkový počet udalostí",
+        "ViewEvents": "Zobraziť udalosti"
     }
 }
\ No newline at end of file