Conflicts:
	core/Version.php
	plugins/Actions/Menu.php
	plugins/CoreHome/angularjs/history/history.service.js
	plugins/CoreHome/javascripts/menu.js
	plugins/CoreHome/templates/_menu.twig
	plugins/Dashboard/Menu.php
	plugins/Ecommerce/Menu.php
	plugins/ExampleUI/Menu.php
	plugins/Goals/Menu.php
	plugins/Referrers/Menu.php
	plugins/VisitsSummary/Menu.php
	tests/UI/expected-ui-screenshots
	tests/UI/specs/UIIntegration_spec.js