Lots of eligibility changes.
Merge branch 'master' of https://github.com/apfestin/CS192DCS.git

Conflicts:
	application/controllers/updatestatistics.php
	application/models/grades_model.php