Gestion de Cambio
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	demo_project/demo_app/templates/HtmlTipoItem/tipo_item_to_item.html
Merge remote-tracking branch 'origin/master'
Gestion de Cambio
Merge remote-tracking branch 'origin/master'