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
City Module Added
Staff merge with master
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
Bug in adding batch.  [Resolved]
Merge branch 'master' of https://github.com/sharadrsoni/akshar_design_solution
Merge branch 'master' of https://github.com/vaishali91/akshar_design_solution into vaishali91-master

Conflicts:
	application/controllers/branch_manager.php
Merge branch 'master' of https://github.com/sharadrsoni/akshar_design_solution
Merge pull request #26 from sharadrsoni/master

updating in batch
Merge pull request #27 from sharadrsoni/vaishali91-master

Merge pull request #26 from sharadrsoni/master