add.php
Merge remote-tracking branch 'remotes/origin/Nitesh' into Nitesh

Conflicts:
	application/views/components/scholarships/add/add.php