Reverted previous commit
Merge remote-tracking branch 'plone.app.dexterity/master'

Conflicts:
	plone/app/dexterity/browser/configure.zcml
	plone/app/dexterity/browser/render.py