Conflicts:
	core/FrontController.php
	core/Log.php
	plugins/API/API.php
	tests/PHPUnit/Fixture.php
	tests/PHPUnit/UI