Added a report descriptor to handle template with both indicator and cohort report components
Merge pull request #3 from ojwanganto/hybrid-report-descriptor

Added a report descriptor to handle template with both indicator and coh...