Working on 2.0 merge 2
Merge branch 'master' of https://github.com/plone/plone.app.multilingual

Remove legacy code from menu.py, pep8 and flake8 cleanup
Errors on merge
Remove committed conflicts
Resolve conflicts

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