fix seed
Merge remote-tracking branch 'origin/master'

Conflicts:
	lib/server/seed.coffee