uping version number
fixing html scoop and filter code. It was originally using a a method that would bypass special case handling for items like Procedure Performed with a result
Merge branch 'develop'
uping version number
pass data_criteria into Cat 1 templates
Merge pull request #46 from carpeliam/develop

pass data_criteria into Cat 1 templates