Revert "make the filters 'OR'ed instead of 'AND'ed"

This reverts commit 9f9a2fbefecd3ce2811331e3e1f04321d66b79f2.
fix bug with filter in usersummary report
Merge pull request #1527 from dimagi/tc

Change filters back to AND and fix bug with user summary filter