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
Merge branch 'develop' into medaxion
Merge branch 'master' into medaxion