Remove tests and add deprecation logs for old discussion infrastructure.
Fixed a bug when using vocabulary with Int values
added the changes/history line info
do not call factory multiple times
Replace deprecated test assert statements.
Merge branch 'master' of git://github.com/plone/Products.Archetypes

Conflicts:
	CHANGES.txt
Adding js calendar for AT contentypes while widgets is not there
fix accidental change
Merge remote-tracking branch 'origin/plip-13260-step_by_step'
move more dependencies of calendar_macros here
Merge remote-tracking branch 'upstream/master'