planned_microinjection_summary_and_conflicts updates for performance
Merge remote-tracking branch 'origin/master' into report_refactoring
planned_microinjection_summary_and_conflicts speed changes
Merge branch 'master' into report_refactoring
remaining report rewrites
remove extra report views
report refactoring && new intermediate report generation
Merge remote-tracking branch 'origin/staging' into report_refactoring

Conflicts:
	db/schema.rb