Merge remote-tracking branch 'origin/master'

Conflicts:
	application/libraries/Lead_validator.php
	application/views/user/view_details.php
Change blaclisted
Conflict resolved

Conflict resolved