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
fix accidental change
Merge remote-tracking branch 'origin/plip-13260-step_by_step'
move more dependencies of calendar_macros here
Update Field.py

Do not add a transaction_note to specify that a field instance was empty, just add an info message to the log
Update utils.py

Do not return the value that is () when empty, return an empty string managed by ', '.join(nvalues).  This way, we avoid that displayValue returns () when the selection is empty...
Update CHANGES.txt

Update change log regarding last changes...
Add tests for empty value in at_utils.translate.
Internationalized file size and content type on file widget.
Do not use portal_interface tool but @@plone_interface_info (PLIP #13770)
fix typo
remove unused calendar_popup and calendarDatePickerBoxPopup macro
Merge pull request #34 from plone/plip-13770-portal-tools-removal

PLIP 13770 Use plone_interface_info instead of portal_interface
Internationalized file size and content type on image widget.
remove dependency on CMFCalendar