Add a 'max_tabs' option to form-tabbing.js to allow changes to the number of tabs displayed before the script uses a dropdown instead.
Merge branch 'master' of github.com:plone/Products.CMFPlone into esteele-master

Conflicts:
	docs/CHANGES.rst