fix param
Merge branch 'master' of github.com:marmotasystem/cantv

Conflicts:
	application/models/estado.php