Merge
Merge branch 'master' of github.com:RGLab/LabKeyModules
merge
Merge branch 'master' of github.com:RGLab/LabKeyModules

Conflicts:
	HAI_vs_GE/resources/reports/schemas/lists/gene_expression_analysis_result_wide/HAI_vs_GE.Rmd
Moved the report so it uses a custom query as labkey.data