finetune
Merge branch 'master' of github.com:JRF-attorney/jrf-attorney-web

Conflicts:
	application/models/lawyermodel.php