i18n update
Merge branch 'cinque' of github.com:pythonitalia/pycon_site into cinque

Conflicts:
	locale/it/LC_MESSAGES/django.po