Apparently some javascript stuff doesn't work right unless this is commented out
Take archived contacts into account when reporting stats
Merge branch 'master' into dev
Merge branch 'report_indicators_archive_fix' into dev