[Update] - commiting.
[Update] - added htaccess file.
Merge remote-tracking branch 'remotes/origin/Nitesh' into Kaustubh

Conflicts:
	application/views/components/scholarships/add/add.php
	application/views/components/scholarships/detail/content.php
	web/js/script.js
Merge remote-tracking branch 'remotes/origin/Kaustubh' into Nitesh

Conflicts:
	.htaccess
Add Scholarship changes