Merge pull request #8 from iaen-edu/staging

update jonathan
Merge pull request #9 from iaen-edu/staging

update mauricio
Merge pull request #5 from iaen-edu/staging

update modulo hoja de vida
update modulo hoja de vida
Merge branch 'staging' of https://github.com/fabianzucho/refactory into staging

Conflicts:
	iaen_base/views/iaen_base_views.xml
Merge pull request #32 from mauriciofierrom/staging

Tabs para Hoja de Vida
CRUD capacitacion e idiomas
Merge pull request #10 from iaen-edu/staging

update mauricio
actualizacion curriculum
Merge branch 'jonathan12101986-staging' into staging
Merge pull request #6 from iaen-edu/staging

update modulo hoja de vida con cambios
Update modulo hoja de vida
Update modulo hoja de vida
Merge pull request #33 from jonathan12101986/staging

CRUD capacitacion e idiomas
Merge pull request #34 from fabianzucho/staging

Actualizacion de modulo hoja de vida, pestaña Instruccion Academica y Experiencia Laboral
Merge pull request #11 from iaen-edu/staging

update fabian
add data for division politica. agragar ejemplo para csv2xml
Merge branch 'staging' of https://github.com/palichis/refactory into staging

Conflicts:
	iaen_base/__openerp__.py
	iaen_base/views/iaen_base_menus.xml
Merge pull request #35 from palichis/staging

add data for division politica. agragar ejemplo para csv2xml
Merge pull request #2 from iaen-edu/staging

Actualizar Hoja de Vida