CAP-1520 : gui cleanup
CAP-1754 fix of polling and criteria storage
Merge branch 'master' into develop

* master:
  CAP-1754 fix of polling and criteria storage
  CAP-1520 : gui cleanup