Correcion del CRUD idioma
y capacitacion
Merge pull request #46 from mauriciofierrom/staging

Cambios a raíz de la reunión
Correcion de palichis, idioma y capacitacion
agregando logos de iaen a los modulos
Merge pull request #48 from palichis/staging

agregando logos de iaen a los modulos
Merge branch 'iaen-edu-staging' into staging

Conflicts:
	iaen_base/__openerp__.py
Merge pull request #47 from jonathan12101986/staging

Correcion de palichis, idioma y capacitacion
Merge branch 'staging' of https://github.com/iaen-edu/refactory into iaen-edu-staging

Merge
Merge branch 'iaen-edu-staging' into staging

Actualizando cambios.