Use template B for collection's content types
Merge branch 'master' of https://github.com/collective/collective.documentgenerator

Conflicts:
	src/collective/documentgenerator/demo/helper.py