Merge branch 'master' into Eran
report queries calculate
reports query mostly finished
Merge branch 'Eran'