el terrible pulento de comit vieja
Merge remote-tracking branch oaskodksaokaodkasodkosakdoaskdo'origin/master'

Conflicts:
	protected/controllers/SiteController.php
	themes/semantic/views/donantes/asigna_alergia.php
	themes/semantic/views/donantes/asignaenfermedad.php
	themes/semantic/views/donantes/view.php