edit student annotations
Merge remote-tracking branch 'origin/master'

Conflicts:
	X-Junior-core/src/main/java/entity/Student.java