start query filter calculation
Merge branch 'Adar'
Update Report Queries
Merge branch 'Eran'
Merge branch 'master' into Eran
report queries calculate
reports query mostly finished
Merge branch 'Eran'
Merge branch 'master' into Adar