SDPIII-51 fixing bug in complaint_Report
SDPIII-51 fixing discrepancy time bug
Merge branch 'master' into demo

Conflicts:
	app/models/computed_reports/complaint_report.rb