Remove committed conflicts
Resolve conflicts

Conflicts:
	devel/plone/app/multilingual/shared_uuid.py
	devel/plone/app/multilingual/subscriber.py