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 #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 #34 from fabianzucho/staging

Actualizacion de modulo hoja de vida, pestaña Instruccion Academica y Experiencia Laboral