i18n
Merge branch 'master' of https://github.com/c2corg/camptocamp.org

Conflicts:
	apps/frontend/i18n/messages.it.po