modificato claudio
Merge remote-tracking branch 'origin/master'

Conflicts:
	prova2/views.py
modificato claudio