fixed! totoo na to
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/views/salveofficer/dailycollection.php