cambios en render page todos views
addProd sin items promo
tipo prod requerido
fix category
no test1
merge
change Product mejorado
checkUser en singUp
checkUser en singUp
Merge branch 'master' into develop

Conflicts:
	chieti/chieti/views.py
Merge branch 'develop' of https://github.com/stefanoantonel/ChietiV2.git
into develop
br en mainhead
add lastName required
quienes somoS
Merge branch 'develop' of https://github.com/stefanoantonel/ChietiV2.git
into develop

Conflicts:
	chieti/chieti/static/chieti/css/style.css
	chieti/chieti/templates/chieti/mainHead.html
	chieti/chieti/templates/chieti/productsTemplate.html
	chieti/chieti/templates/chieti/quienesSomos.html
	chieti/chieti/urls.py
	chieti/chieti/views.py
merge
Merge branch 'develop' of https://github.com/stefanoantonel/ChietiV2
into develop

Conflicts:
	chieti/chieti/static/chieti/css/style.css
	chieti/chieti/templates/chieti/addProduct.html
	chieti/chieti/templates/chieti/changeProduct.html
	chieti/chieti/templates/chieti/productsTemplate.html
	chieti/chieti/templates/chieti/singUp.html
	chieti/chieti/tests.py