Cancel Button added
Cancel Button Added
Merge remote branch 'upstream1/master'

Conflicts:
	application/views/backend/admin/course.php
add Cancel Button
Menu Active
change in show attendance module
Merge remote branch 'upstream1/master'
Menu active
Merge remote branch 'upstream1/master'
Merge pull request #75 from vaishali91/master

Add Cancel Button
Student Result
Merge remote branch 'upstream/master'

Conflicts:
	application/controllers/student.php
Show attendance Complete
Display Marks Complete
Add Forgot Password
Merge remote branch 'upstream1/master'
Merge pull request #78 from vaishali91/master

Add Forgot Password
Merge pull request #77 from dvlimbasiya/master

attnedance and sudent course image.
Merge branch 'master' of https://github.com/sharadrsoni/akshar_design_solution

Conflicts:
	application/models/test_result_model.php
Dashboard Complete
Student dashboard design complete
Course design updated