tipo de Item v1
Item v1
Item v2
Item v3
setear pass
Merge branch 'itemsAdm'

Conflicts:
	Sigma_System/urls.py
	Sigma_System/views.py
	templates/principal.html
setear pass