Reverted more lost changes, inital empty db dump
Fixed some merging conflicts
Fixed the same merging conflicts again

Recompute standing and eligibility on edit grade
Refactored Dan's standing recomputation
Merge branch 'master' of https://github.com/apfestin/CS192DCS

Conflicts:
	application/controllers/updatestatistics.php
	application/models/fields/grade.php
Merge conflicts