Update seeds, which in turn highlighted some glitches, including the absence of the 'merged' flag from EventFlagHistory.
Merge branch 'master' into sched

Conflicts:
	db/schema.rb