Branch_delete
Course_Display
Course_Insert
course_Delete
Merge remote branch 'upstream/master'

Conflicts:
	application/controllers/branch_manager.php
Merge remote branch 'upstream/master'

Conflicts:
	application/controllers/branch_manager.php
Merge remote branch 'upstream/master'
Course
Merge remote branch 'upstream/master'

Conflicts:
	application/controllers/admin.php
	application/controllers/branch_manager.php
	application/models/branch_model.php
	application/views/backend/branch_manager/branch.php
frontend
bhai target view moklu chu.
view for batch page
Merge remote branch 'upstream/master'

Conflicts:
	application/controllers/branch_manager.php
	application/controllers/branch_manager_counsellor.php
Ajax Coding
Merge pull request #36 from dvlimbasiya/master

bhai target view moklu chu.
Merge branch 'master' of https://github.com/mohit0202/akshar_design_solution

Conflicts:
	application/controllers/branch_manager_counsellor.php
Merge pull request #38 from UnnatiPatel/master

placeholder added
Send Notification views changed and model added
Merge remote branch 'upstream1/master'
Test module changes
Book Inventory Module complete