Profle pages
Test/Target merged
minor change
Merge branch 'master' of https://github.com/dvlimbasiya/akshar_design_solution

Conflicts:
	application/controllers/staff.php
	application/controllers/student.php
	application/models/staff_model.php
	application/models/student_model.php
Module method updated and duplicate method deleted.
Merge branch 'master' of https://github.com/sharadrsoni/akshar_design_solution

Conflicts:
	application/controllers/admin.php
	application/models/attendance_model.php
	application/models/batch_model.php
	application/models/book_inventory_model.php
	application/models/branch_model.php
	application/models/event_model.php
	application/models/inquiry_model.php
	application/models/staff_model.php
	application/models/user_model.php