Re-generate assets
Merge branch 'non_specific_amendments' into staging
Merge branch 'master' into staging
Merge branch 'batch_welcome_emails2' into staging
Re-generate assets
Merge branch 'amend_bugs' into staging
Re-generate assets
Merge branch 'master' into staging
Merge branch 'batch_welcome_emails2' into staging
Re-generate assets
Merge branch 'batch_welcome_emails2' into staging
Merge branch 'amendments_to_attempts' into staging
Re-generate assets
Merge branch 'report_amendments' into staging
Merge branch 'master' into staging
Merge branch 'report_and_status_amendements' into staging
Merge remote-tracking branch 'origin/master' into staging

Conflicts:
	test/functional/targ_rep/gene_traps_controller_test.rb
Merge branch 'batch_welcome_emails2' into staging

Conflicts:
	test/functional/targ_rep/gene_traps_controller_test.rb
Re-generate assets
Merge branch 'new_gene_summery_cache' into staging