Signed-off-by: khxkhx321 <khxkhx321@163.com>
Merge branch 'master' of https://github.com/MonsterStorm/Play_AdmissionsDistribution

Conflicts:
	app/models/EducationInstitution.java
	app/models/Instructor.java

Signed-off-by: khxkhx321 <khxkhx321@163.com>