x
Merge branch 'master' of https://github.com/stefanoantonel/ChietiV2.git

Conflicts:
	Chieti/chieti/views.py