City Module Added
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