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

Conflicts:
	chieti/chieti/views.py