event_type_model added
event_type_model changed
branch_manager.php changed
eventtype.php changed
eventtype.php changed
Modified
modified
event type add and delete completed
Merge branch 'master' of https://github.com/UnnatiPatel/akshar_design_solution into UnnatiPatel-master

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

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

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

Conflicts:
	application/controllers/branch_manager.php
and update Control separation