allow other extension after datepublisher to use add_extension_options()
Merge branch 'master' into next

* master:
  allow other extension after datepublisher to use add_extension_options()
Merge branch 'next' into tabbed_options

Conflicts:
	feincms/module/extensions/datepublisher.py