integrated addTokenToUrl from plone.protect.utils on generated delete url
merge conflicting listing.py
Merge branch 'master' of git://github.com/plone/plone.schemaeditor