HV-835 Updating to ClassMate 1.0.0