Merge pull request #8 from iaen-edu/staging

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

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

update mauricio
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