Conflicts:
	CHANGELOG.md
	core/Plugin/Controller.php
	core/Version.php
	plugins/API/ProcessedReport.php
	plugins/CoreHome/CoreHome.php
	plugins/CoreHome/javascripts/corehome.js
	plugins/CoreHome/javascripts/menu.js
	plugins/CoreHome/javascripts/menu_init.js
	plugins/CoreHome/lang/en.json
	plugins/CoreHome/stylesheets/zen-mode.less
	plugins/CoreHome/templates/ReportsByDimension/_reportsByDimension.twig
	plugins/CoreHome/templates/_indexContent.twig
	plugins/CoreHome/templates/getDefaultIndexView.twig
	plugins/Dashboard/Menu.php
	plugins/Dashboard/javascripts/dashboard.js
	plugins/Dashboard/javascripts/dashboardObject.js
	plugins/Goals/templates/_titleAndEvolutionGraph.twig
	plugins/Goals/templates/getOverviewView.twig
	plugins/Morpheus/javascripts/piwikHelper.js
	plugins/Referrers/templates/index.twig
	plugins/UserCountry/templates/index.twig
	plugins/VisitFrequency/templates/_sparklines.twig
	plugins/ZenMode/ZenMode.php
	plugins/ZenMode/javascripts/zen-mode.js
	tests/PHPUnit/Fixtures/UITestFixture.php
	tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml
	tests/UI/expected-ui-screenshots
	tests/UI/specs/Dashboard_spec.js
	tests/UI/specs/Menus_spec.js
	tests/UI/specs/UIIntegration_spec.js