Merge remote branch 'upstream/master'

Conflicts:
	application/controllers/admin.php
	application/models/course_model.php
line changed
Merge branch 'master' of https://github.com/sharadrsoni/akshar_design_solution
Frontend
Profle pages
Test/Target merged
minor change
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
	application/models/staff_model.php
	application/models/student_model.php
field name changed & Batch Id generation logic changed.
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
Merge branch 'master' of https://github.com/vaishali91/akshar_design_solution

Conflicts:
	application/views/backend/branch_manager/sendnotification.php
	application/views/backend/branch_manager/staff.php
	application/views/backend/branch_manager/test.php
Merge branch 'master' of https://github.com/kamal3987/akshar_design_solution

Conflicts:
	application/controllers/admin.php
Student Registration Complete
Send Notification Half
Send Notification Part
Add BranchCode in to branch module
Merge branch 'master' of https://github.com/vaishali91/akshar_design_solution

Conflicts:
	application/controllers/branch_manager_counsellor.php
Merge branch 'master' of https://github.com/sharadrsoni/akshar_design_solution

Conflicts:
	application/views/backend/branch_manager/branch.php
batch Model