Filters can Or and And conditionals
Add conditionals to view
Merge pull request #558 from demaagdk/develop

Filters can Or and And conditionals