completar atributos ...
Merge remote-tracking branch 'origin/master'

Conflicts:
	Aplicaciones/Item/views.py
completar atributos ...