JS Change and Targetype Update done.
Merge branch 'master' of https://github.com/sharadrsoni/akshar_design_solution

Conflicts:
	application/controllers/admin.php