Merge branch 'develop' of https://github.com/stefanoantonel/ChietiV2.git
into develop

Conflicts:
	chieti/chieti/templates/chieti/productsTemplate.html
Merge branch 'develop' of https://github.com/stefanoantonel/ChietiV2 into develop
Merge branch 'develop' of https://github.com/stefanoantonel/ChietiV2.git
into develop
merge