Fix
Fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/controllers/ClientsController.php
	application/models/Clients.php
	application/views/scripts/_main.xsl
	application/views/scripts/clients/index.xsl
	library/Core/Controller/Router/Rout.php
	www/css/client_filter.css
	www/js/client_filter.js