profile page for staff and student
Merge branch 'master' of https://github.com/kamal3987/akshar_design_solution

Conflicts:
	application/controllers/admin.php
	application/models/course_model.php
Merge branch 'master' of https://github.com/sharadrsoni/akshar_design_solution
Merge branch 'master' of https://github.com/dvlimbasiya/akshar_design_solution

Conflicts:
	application/controllers/staff.php
	application/controllers/student.php
Merge branch 'master' of https://github.com/sharadrsoni/akshar_design_solution
Attendence 1
Attendence
Merge remote branch 'upstream/master'

Conflicts:
	application/controllers/faculty.php
ADD
Router File updated and Nevigation path updated
Student Attendence Add
Merge remote branch 'upstream/master'

Conflicts:
	application/controllers/faculty.php
update inquiry Done
line changed
Merge branch 'master' of https://github.com/sharadrsoni/akshar_design_solution
Additional Validation Js Added.
Attendance Complete Student
Brach Page Update duee to conflict
Merge pull request #46 from mohit0202/master

Student Attendance Complete
Merge branch 'master' of https://github.com/sharadrsoni/akshar_design_solution