adding filter
Merge branch 'master' of https://github.com/plansys/plansys
Merge branch 'master' of https://github.com/plansys/plansys
Merge branch 'master' of https://github.com/plansys/plansys
Merge branch 'master' of https://github.com/plansys/plansys
fixing data-grid
Merge branch 'master' of https://github.com/plansys/plansys