another clients.php update
Merge branch 'master' of https://github.com/lstables/clockin1

Conflicts:
	admin/application/controllers/clients.php