collections; split old and newstyle
Merge branch 'master' of https://github.com/plone/documentation

Conflicts:
	index.rst
Merge branch 'master' of https://github.com/plone/documentation