Merge branch 'master' into Adar
forecast: add filters to db and connect to UI
Merge branch 'Adar'