Fix possible breaks in a migration
Merge remote-tracking branch 'upstream/branch-v2' into branch-v2

Conflicts:
	db/migrate/20140120194245_create_recent_activities.rb