Fix JeanPaul error
Merge remote-tracking branch 'origin/master' into JeanPaper

Conflicts:
	admin/protected/modules/admin/controllers/ClientController.php
	admin/protected/modules/admin/controllers/ProviderController.php