htacess changes
Scholarship_service..no changes
Merge remote-tracking branch 'remotes/origin/Kaustubh' into Nitesh

Conflicts:
	.htaccess
Add Scholarship changes
recruit database
Merge branch 'Nitesh' into Kaustubh
update code
[Update] - updated style.css
Merge branch 'Nitesh' into Kaustubh

Conflicts:
	application/views/components/scholarships/detail/content.php