Add demo users.
Merge branch 'master' into batch_welcome_emails2

Conflicts:
	test/functional/targ_rep/gene_traps_controller_test.rb
Fix test/unit/network_graph_test.rb; add asserts to test/unit/notification_mailer_test.rb.
Merge branch 'batch_welcome_emails2' into staging

Conflicts:
	test/functional/targ_rep/gene_traps_controller_test.rb