Simultaneous letter and number grades; courses can comprise GPA without awarding credits

Conflicts:
	ecwsp/grades/models.py
Resolve South conflict
Remove benchmark_grade exceptions from transcripts
Merge pull request #156 from burke-software/jnm-complex-grading-ii

Complex Grading II... la venganza