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

Conflicts:
	application/views/backend/master_page/Header.php
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
course category add and delete complete
targetreport page with addreport and view for targetreport and branch page.
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
faculty method moved
Merge branch 'master' of https://github.com/sharadrsoni/akshar_design_solution
Merge pull request #31 from UnnatiPatel/master

course category add and delete complete
JS Change and Targetype Update done.
Merge branch 'master' of https://github.com/sharadrsoni/akshar_design_solution

Conflicts:
	application/controllers/admin.php
Merge remote branch 'upstream/master'

Conflicts:
	application/controllers/branch_manager.php
	application/controllers/branch_manager_counsellor.php