Merge branch '2.5' of https://github.com/cakephp/cakephp
Merge branch '2.5' of https://github.com/Oxicode/cakephp
console
Merge branch 'master' of https://github.com/Oxicode/cakephp

Conflicts:
	app/Config/database.php