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

1 files changed, 44 insertions, 44 deletions

diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml
index 38fec6a150..c2c4ac7f78 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml
@@ -9,7 +9,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
-				<pageIdAction>12</pageIdAction>
+				<pageIdAction>14</pageIdAction>
 				
 				<pageId>21</pageId>
 				<eventCategory>Movie</eventCategory>
@@ -114,7 +114,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
-				<pageIdAction>12</pageIdAction>
+				<pageIdAction>14</pageIdAction>
 				
 				<pageId>20</pageId>
 				<eventCategory>Movie</eventCategory>
@@ -219,7 +219,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
-				<pageIdAction>12</pageIdAction>
+				<pageIdAction>14</pageIdAction>
 				
 				<pageId>16</pageId>
 				<eventCategory>Movie</eventCategory>
@@ -233,7 +233,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
-				<pageIdAction>12</pageIdAction>
+				<pageIdAction>14</pageIdAction>
 				
 				<pageId>17</pageId>
 				<eventCategory>Movie</eventCategory>
@@ -247,7 +247,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
-				<pageIdAction>12</pageIdAction>
+				<pageIdAction>14</pageIdAction>
 				
 				<pageId>19</pageId>
 				<eventCategory>Movie</eventCategory>
@@ -261,7 +261,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
-				<pageIdAction>12</pageIdAction>
+				<pageIdAction>14</pageIdAction>
 				
 				<pageId>22</pageId>
 				<eventCategory>Movie</eventCategory>
@@ -290,7 +290,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/finishedMovie</url>
-				<pageIdAction>23</pageIdAction>
+				<pageIdAction>25</pageIdAction>
 				
 				<pageId>24</pageId>
 				<eventCategory>event category Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</eventCategory>
@@ -397,7 +397,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
-				<pageIdAction>12</pageIdAction>
+				<pageIdAction>14</pageIdAction>
 				
 				<pageId>18</pageId>
 				<eventCategory>Movie</eventCategory>
@@ -526,7 +526,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/webradio</url>
-				<pageIdAction>2</pageIdAction>
+				<pageIdAction>3</pageIdAction>
 				
 				<pageId>2</pageId>
 				<eventCategory>Music</eventCategory>
@@ -546,7 +546,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/webradio</url>
-				<pageIdAction>2</pageIdAction>
+				<pageIdAction>3</pageIdAction>
 				
 				<pageId>3</pageId>
 				<eventCategory>Music</eventCategory>
@@ -566,7 +566,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/webradio</url>
-				<pageIdAction>2</pageIdAction>
+				<pageIdAction>3</pageIdAction>
 				
 				<pageId>4</pageId>
 				<eventCategory>Music</eventCategory>
@@ -586,7 +586,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/webradio</url>
-				<pageIdAction>2</pageIdAction>
+				<pageIdAction>3</pageIdAction>
 				
 				<pageId>5</pageId>
 				<eventCategory>Music</eventCategory>
@@ -606,7 +606,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/webradio</url>
-				<pageIdAction>2</pageIdAction>
+				<pageIdAction>3</pageIdAction>
 				
 				<pageId>6</pageId>
 				<eventCategory>Music</eventCategory>
@@ -626,7 +626,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/webradio</url>
-				<pageIdAction>2</pageIdAction>
+				<pageIdAction>3</pageIdAction>
 				
 				<pageId>7</pageId>
 				<eventCategory>Music</eventCategory>
@@ -647,7 +647,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/webradio</url>
-				<pageIdAction>2</pageIdAction>
+				<pageIdAction>3</pageIdAction>
 				
 				<pageId>8</pageId>
 				<eventCategory>Music</eventCategory>
@@ -669,7 +669,7 @@
 				<type>action</type>
 				<url>http://example.org/movies</url>
 				<pageTitle>Movie Theater</pageTitle>
-				<pageIdAction>12</pageIdAction>
+				<pageIdAction>13</pageIdAction>
 				
 				<pageId>9</pageId>
 				<generationTime>0.67s</generationTime>
@@ -681,7 +681,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
-				<pageIdAction>12</pageIdAction>
+				<pageIdAction>14</pageIdAction>
 				
 				<pageId>10</pageId>
 				<eventCategory>Movie</eventCategory>
@@ -695,7 +695,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
-				<pageIdAction>12</pageIdAction>
+				<pageIdAction>14</pageIdAction>
 				
 				<pageId>11</pageId>
 				<eventCategory>Movie</eventCategory>
@@ -709,7 +709,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
-				<pageIdAction>12</pageIdAction>
+				<pageIdAction>14</pageIdAction>
 				
 				<pageId>12</pageId>
 				<eventCategory>Movie</eventCategory>
@@ -723,7 +723,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
-				<pageIdAction>12</pageIdAction>
+				<pageIdAction>14</pageIdAction>
 				
 				<pageId>13</pageId>
 				<eventCategory>Movie</eventCategory>
@@ -737,7 +737,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
-				<pageIdAction>12</pageIdAction>
+				<pageIdAction>14</pageIdAction>
 				
 				<pageId>14</pageId>
 				<eventCategory>Movie</eventCategory>
@@ -751,7 +751,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
-				<pageIdAction>12</pageIdAction>
+				<pageIdAction>14</pageIdAction>
 				
 				<pageId>15</pageId>
 				<eventCategory>Movie</eventCategory>
@@ -857,7 +857,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
-				<pageIdAction>12</pageIdAction>
+				<pageIdAction>14</pageIdAction>
 				
 				<pageId>45</pageId>
 				<eventCategory>Movie</eventCategory>
@@ -958,7 +958,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
-				<pageIdAction>12</pageIdAction>
+				<pageIdAction>14</pageIdAction>
 				
 				<pageId>44</pageId>
 				<eventCategory>Movie</eventCategory>
@@ -1059,7 +1059,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
-				<pageIdAction>12</pageIdAction>
+				<pageIdAction>14</pageIdAction>
 				
 				<pageId>40</pageId>
 				<eventCategory>Movie</eventCategory>
@@ -1073,7 +1073,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
-				<pageIdAction>12</pageIdAction>
+				<pageIdAction>14</pageIdAction>
 				
 				<pageId>41</pageId>
 				<eventCategory>Movie</eventCategory>
@@ -1087,7 +1087,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
-				<pageIdAction>12</pageIdAction>
+				<pageIdAction>14</pageIdAction>
 				
 				<pageId>43</pageId>
 				<eventCategory>Movie</eventCategory>
@@ -1101,7 +1101,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
-				<pageIdAction>12</pageIdAction>
+				<pageIdAction>14</pageIdAction>
 				
 				<pageId>46</pageId>
 				<eventCategory>Movie</eventCategory>
@@ -1130,7 +1130,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/finishedMovie</url>
-				<pageIdAction>23</pageIdAction>
+				<pageIdAction>25</pageIdAction>
 				
 				<pageId>48</pageId>
 				<eventCategory>event category Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</eventCategory>
@@ -1233,7 +1233,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
-				<pageIdAction>12</pageIdAction>
+				<pageIdAction>14</pageIdAction>
 				
 				<pageId>42</pageId>
 				<eventCategory>Movie</eventCategory>
@@ -1358,7 +1358,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/webradio</url>
-				<pageIdAction>2</pageIdAction>
+				<pageIdAction>3</pageIdAction>
 				
 				<pageId>26</pageId>
 				<eventCategory>Music</eventCategory>
@@ -1378,7 +1378,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/webradio</url>
-				<pageIdAction>2</pageIdAction>
+				<pageIdAction>3</pageIdAction>
 				
 				<pageId>27</pageId>
 				<eventCategory>Music</eventCategory>
@@ -1398,7 +1398,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/webradio</url>
-				<pageIdAction>2</pageIdAction>
+				<pageIdAction>3</pageIdAction>
 				
 				<pageId>28</pageId>
 				<eventCategory>Music</eventCategory>
@@ -1418,7 +1418,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/webradio</url>
-				<pageIdAction>2</pageIdAction>
+				<pageIdAction>3</pageIdAction>
 				
 				<pageId>29</pageId>
 				<eventCategory>Music</eventCategory>
@@ -1438,7 +1438,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/webradio</url>
-				<pageIdAction>2</pageIdAction>
+				<pageIdAction>3</pageIdAction>
 				
 				<pageId>30</pageId>
 				<eventCategory>Music</eventCategory>
@@ -1458,7 +1458,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/webradio</url>
-				<pageIdAction>2</pageIdAction>
+				<pageIdAction>3</pageIdAction>
 				
 				<pageId>31</pageId>
 				<eventCategory>Music</eventCategory>
@@ -1479,7 +1479,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/webradio</url>
-				<pageIdAction>2</pageIdAction>
+				<pageIdAction>3</pageIdAction>
 				
 				<pageId>32</pageId>
 				<eventCategory>Music</eventCategory>
@@ -1501,7 +1501,7 @@
 				<type>action</type>
 				<url>http://example.org/movies</url>
 				<pageTitle>Movie Theater</pageTitle>
-				<pageIdAction>12</pageIdAction>
+				<pageIdAction>13</pageIdAction>
 				
 				<pageId>33</pageId>
 				<generationTime>0.67s</generationTime>
@@ -1513,7 +1513,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
-				<pageIdAction>12</pageIdAction>
+				<pageIdAction>14</pageIdAction>
 				
 				<pageId>34</pageId>
 				<eventCategory>Movie</eventCategory>
@@ -1527,7 +1527,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
-				<pageIdAction>12</pageIdAction>
+				<pageIdAction>14</pageIdAction>
 				
 				<pageId>35</pageId>
 				<eventCategory>Movie</eventCategory>
@@ -1541,7 +1541,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
-				<pageIdAction>12</pageIdAction>
+				<pageIdAction>14</pageIdAction>
 				
 				<pageId>36</pageId>
 				<eventCategory>Movie</eventCategory>
@@ -1555,7 +1555,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
-				<pageIdAction>12</pageIdAction>
+				<pageIdAction>14</pageIdAction>
 				
 				<pageId>37</pageId>
 				<eventCategory>Movie</eventCategory>
@@ -1569,7 +1569,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
-				<pageIdAction>12</pageIdAction>
+				<pageIdAction>14</pageIdAction>
 				
 				<pageId>38</pageId>
 				<eventCategory>Movie</eventCategory>
@@ -1583,7 +1583,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
-				<pageIdAction>12</pageIdAction>
+				<pageIdAction>14</pageIdAction>
 				
 				<pageId>39</pageId>
 				<eventCategory>Movie</eventCategory>