URL Simplified
Merge branch 'master' of https://github.com/sharadrsoni/akshar_design_solution

Conflicts:
	application/views/backend/master_page/Header.php
Login Method Changed
Merge branch 'master' of https://github.com/sharadrsoni/akshar_design_solution

Conflicts:
	application/controllers/branch_manager_counsellor.php
	application/controllers/faculty.php
	application/controllers/staff.php
	application/controllers/student.php