Conflicts:
	core/Tracker/Settings.php
	core/Tracker/Visit.php
	plugins/Actions/Widgets.php
	plugins/CustomVariables/Widgets.php
	plugins/DevicesDetection/DevicesDetection.php
	plugins/DevicesDetection/Widgets.php
	plugins/Events/Widgets.php
	plugins/Provider/Widgets.php
	plugins/UserCountry/Widgets.php
	plugins/UserSettings/Widgets.php
	plugins/VisitTime/Widgets.php
	plugins/VisitorInterest/Widgets.php