Add nested and/or filtering
Merge pull request #323 from ambiata/topic/filter-and-or

Add nested and/or filtering