g
Merge remote-tracking branch 'origin/master'

Conflicts:
	proyecto_grado/app/controllers/ControlEntidades.php