URL Simplified
Merge branch 'master' of https://github.com/sharadrsoni/akshar_design_solution

Conflicts:
	application/views/backend/master_page/Header.php
Event Update done
Merge pull request #29 from dvlimbasiya/master

View
targettype add and delete complete
Merge branch 'master' of https://github.com/UnnatiPatel/akshar_design_solution into UnnatiPatel-master

Conflicts:
	application/controllers/branch_manager.php
	application/models/target_type_model.php
and Create Target Type module
Login Method Changed
Merge branch 'master' of https://github.com/sharadrsoni/akshar_design_solution

Conflicts:
	application/controllers/branch_manager_counsellor.php
	application/controllers/faculty.php
	application/controllers/staff.php
	application/controllers/student.php
Change in Controller
Merge branch 'master' of https://github.com/sharadrsoni/akshar_design_solution
Merge branch 'master' of https://github.com/dvlimbasiya/akshar_design_solution into dvlimbasiya-master

Conflicts:
	application/controllers/branch_manager.php
	application/views/backend/branch_manager/branch.php
brach view. use <br> in address for seperate street and city and state value.