[Update] - updated search code.
Merge branch 'Nitesh' into Kaustubh
[Update] - added spaces to tagit.
Merge remote-tracking branch 'remotes/origin/Kaustubh' into Nitesh

Conflicts:
	application/services/scholarships_service.php