NEON-1062 Adding watchings on the filter value and AND/OR to update the filter when they change.
Merge branch 'angular-demo' of https://github.com/NextCenturyCorporation/neon into angular-demo