declare plone.formwidget.contenttree dependency
Merge branch 'master' of git://github.com/collective/collective.alias

Conflicts:
	setup.py