Formularios completos
Merge branch 'master' of github.com:ErickSanchez/sua

Conflicts:
	application/views/prima/calculo_dias.php