View, Update and Login
Merge branch 'master' of https://github.com/sharadrsoni/akshar_design_solution

Conflicts:
	application/controllers/branch_manager.php