Dashboard Complete
Student dashboard design complete
Course design updated
Reset Password Added
Merge remote branch 'upstream1/master'
Merge pull request #80 from vaishali91/master

Reset Password Added
Forgot Password (1/2)
Date chage done
Merge branch 'master' of https://github.com/sharadrsoni/akshar_design_solution
course image
Merge branch 'master' of https://github.com/sharadrsoni/akshar_design_solution

Conflicts:
	application/controllers/login.php
Merge branch 'master' of https://github.com/sharadrsoni/akshar_design_solution
Add Date Format and Cancel Button in test and show attendance page
Merge pull request #82 from vaishali91/master

Add Date Format and Cancel Button in test and show attendance page
Merge pull request #81 from dvlimbasiya/master

course image
Merge branch 'master' of https://github.com/mohit0202/akshar_design_solution

Conflicts:
	application/controllers/admin.php
	assets/pagescript/InquiryManage.js
Merge branch 'master' of https://github.com/sharadrsoni/akshar_design_solution

Conflicts:
	application/views/backend/branch_manager/staff_profile.php
	assets/pagescript/BatchManage.js
	assets/pagescript/EventManage.js
MD5 Password
studnet dashboard complete
Merge branch 'master' of https://github.com/sharadrsoni/akshar_design_solution