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
Merge remote branch 'upstream/master'

Conflicts:
	application/controllers/student.php
Show attendance Complete
Display Marks Complete