report at zero
Merge branch 'developer/davidsingal' into dev

* developer/davidsingal:
  report at zero
Merge branch 'dev' into production