changelog
Merge branch 'master' of github.com:collective/collective.nitf

Conflicts:
	docs/HISTORY.txt
Merge branch 'master' of github.com:collective/collective.nitf
Merge branch 'master' of github.com:collective/collective.nitf

Conflicts:
	docs/HISTORY.txt