cambio en cagadas del pedro

pedro ql
Merge remote-tracking branch 'origin/master'

Conflicts:
	fhd_register_action.php GG
Merge branch 'master' of https://github.com/pedrogonzalezjara/Proyecto_Desempeno