Modified editstudent to use hard reset methods. fixed spelling/javadoc
Merge remote-tracking branch 'origin/develop' into develop