Changes to accommodate a report with both indicator and cohort components
Merge pull request #128 from ojwanganto/hybrid-template

Changes to accommodate a report with both indicator and cohort component...