bdd y despachos
LOLMerge branch 'master' of https://github.com/mrbungie/cakephp

Conflicts:
	app/Config/database.php