2.4 => 3.0

There were conflicts in `Router.php`, `RouterTest.php` and `Console/cake.php`. I ignored all changes as i think they are not needed in 3.0