be (a little) more explicit about joining permissions
test permission OR-ing (simple)
Merge pull request #1036 from dimagi/permissions-OR

be (a little) more explicit about joining permissions