reverted
merged branch
merged
controller changed....made file groups in view
css done in stylesheet , controller updated
Merge remote-tracking branch 'remotes/origin/sharad' into Kaustubh

Conflicts:
	application/views/components/profile/contentpage/acads.php
	application/views/components/scholarships/add/add.php
	application/views/layouts/default_html_view.php
	web/css/style.css
	web/js/script.js