Fixing #683, #672: x axis time range in trending report
Merge branch 'sbir-phase2' into 2.2i3