Fixed seed data
Merge branch 'jh_another_alignment_attempt' into pew

Conflicts:
	app/views/dashboard/index.html.erb