Conflicts:
	core/ErrorHandler.php
	core/ExceptionHandler.php
	core/FrontController.php
	core/Log.php
	core/Piwik.php