Re-generate assets
Merge branch 'master' into staging
Merge branch 'allele_image_fix' into staging
Re-generate assets
Merge branch 'mi_phenotype_rest_changes' into staging
Re-generate assets
initial changes for new mi_plan qc
Merge branch 'master' into mi_plan_status_change
remove comment
initial changes for completion note & recovery attributes
remove comments
Merge branch 'master' into staging

Conflicts:
	public/assets/common.css
	public/assets/targ_rep.css
Merge branch 'mi_plan_project_completion_note' into staging
Merge branch 'mi_plan_status_change' into staging

Conflicts:
	db/schema.rb
jammit
Merge remote-tracking branch 'origin/staging' into report_column_additions