Modelo
Merge branch 'master' of https://github.com/rgarciacejudo/CoordinacionDeInvestigacion

Conflicts:
	InvestigationProject/app/Controller/UserController.php
	InvestigationProject/app/View/Layouts/default.ctp