corrected expected_reporting_devices charts mistakes
Merge remote-tracking branch 'origin/develop' into feature/charts

Conflicts:
	application/config/procedures_sql.php
	application/modules/charts/models/pima_model.php