Merge branch 'v1.1'

Conflicts:
	indico/MaKaC/plugins/Collaboration/handlers.py
[FIX] Whatever