credit check
Merge branch 'master' of https://github.com/REDSPK/ecan.in

Conflicts:
	application/controllers/csv.php