Merge remote branch 'upstream/master'

Conflicts:
	application/controllers/branch_manager.php
	application/controllers/branch_manager_counsellor.php
Ajax Coding
Merge branch 'master' of https://github.com/mohit0202/akshar_design_solution

Conflicts:
	application/controllers/branch_manager_counsellor.php