More WebCAT stuff
Merge branch 'master' of https://github.com/kosigz/XxXGradeXxX

Conflicts:
	gradebook/MyGradeBook.java