update faculty-members page
Merge branch 'master' of https://github.com/dailenearanas/iJMC-WebApp

Conflicts:
	fuel/app/classes/controller/admin.php
	fuel/app/classes/controller/admin/faculty.php
	fuel/app/views/admin/dashboard.php
	fuel/app/views/admin/faculty/index.php
	fuel/app/views/admin/facultymember.php
	fuel/app/views/admin/student/_form.php
	fuel/app/views/admin/template.php
	public/assets/css/style.css
changes in faculty forms