Conflicts:
	core/Version.php
	core/WidgetsList.php
	plugins/CustomDimensions
	plugins/Goals/templates/getGoalReportView.twig
	plugins/Goals/templates/getOverviewView.twig
	tests/UI/expected-ui-screenshots