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
Course Category update done
brach view. use <br> in address for seperate street and city and state value.
course view
frontend
Button name change.
Merge branch 'master' of https://github.com/mohit0202/akshar_design_solution into mohit0202-master

Conflicts:
	application/controllers/branch_manager.php
	application/controllers/branch_manager_counsellor.php
Conflict romove
Merge branch 'master' of https://github.com/dvlimbasiya/akshar_design_solution

Conflicts:
	application/views/backend/branch_manager/branch.php
bhai target view moklu chu.
view for batch page
Merge pull request #36 from dvlimbasiya/master

bhai target view moklu chu.
placeholder added