announcements
Merge branch 'version_2_4' into version_2_5

Conflicts:
	db/schema.rb