i18n update
Merge branch 'master' of https://github.com/pythonitalia/conference

Conflicts:
	conference/locale/en/LC_MESSAGES/django.po
	conference/locale/it/LC_MESSAGES/django.po