nada grave
Merge branch 'alpha' of https://github.com/NAIJULU/premiosantioquia into alpha

Conflicts:
	default/app/controllers/administrador_controller.php