Branch_Display
Merge remote branch 'upstream/master'

Conflicts:
	application/controllers/branch_manager.php
	application/models/branch_model.php
Merge remote branch 'upstream/master'
Branch_insert
batchmanage.js
 updated
Merge branch 'master' of https://github.com/sharadrsoni/akshar_design_solution
Updated
Merge branch 'master' of https://github.com/kamal3987/akshar_design_solution into kamal3987-master

Conflicts:
	application/controllers/branch_manager.php
Final befor ppt
Branch update
Merge pull request #15 from mohit0202/master

Final befor ppt
Brach_manaer.js updated
branch
Merge pull request #16 from mohit0202/master

branch
JQuery updated
eventtype.php added
eventtype_css.php added
EventTypeManage.js added
eventtype_js.php added
eventtype function added in branchmanager.php file