Merge branch 'develop' into feature/report

* develop:
  active projects
  filters ALL
[finish #77644656]
[finish #77644510]