work with me
Merge remote-tracking branch 'remotes/origin/Nitesh' into Kaustubh

Conflicts:
	application/controllers/about.php
	application/controllers/scholarships.php
	application/controllers/top.php
	application/views/components/about/content/offerings.php
	application/views/components/scholarships/add/add.php
	application/views/components/top/main2.php
	application/views/layouts/default_html_view.php