that plone.resourceeditor subdirectory was added accidently, was it?
Merge branch 'master' of git://github.com/plone/plone.resourceeditor