modo-edicion
Merge branch 'master' of https://github.com/avalostechnology/integrate

Conflicts:
	integra/addons/export_view_list/__integra__.py