Improve migrator
Update content type blacklist
Merge branch 'master' of https://github.com/plone/plone.app.multilingual

Conflicts:
	src/plone/app/multilingual/browser/migrator.py