Merge pull request #5 from iaen-edu/staging

Merge pull request #18 from jonathan12101986/staging
CRUD identidad de genero Finalizado en ingles
Modificacion del CRUD de estado civil, añadiendo data
Merge pull request #4 from iaen-edu/staging

update branch
Merge pull request #6 from iaen-edu/staging

Merge 02 julio
CRUD identidad de genero Depurado para otros caracteres
CRUD identidad genero anadido gender_data
eliminando py~
Merge pull request #20 from palichis/staging

Merge pull request #4 from iaen-edu/staging
Merge branch 'staging' of https://github.com/palichis/refactory into staging

Conflicts:
	.gitignore
correct conflicts .gitignore
Merge pull request #21 from palichis/staging

eliminación de .py~
merger auto
delete ~
modified gitignore
Merge branch 'jonathan12101986-staging' into staging

Conflicts:
	.gitignore
merge
Merge branch 'staging' of https://github.com/iaen-edu/refactory into iaen-edu-staging

Conflicts:
	.gitignore
	iaen_base/__openerp__.py~
	iaen_base/iaen_base.py~
Merge branch 'iaen-edu-staging' into staging
Merge pull request #22 from jonathan12101986/staging

Correccion CRUD genero