Merge branch 'developer/davidsingal' into dev
Merge branch 'developer/davidsingal' into dev
report and routes