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

Conflicts:
	app/controllers/CommonController.java
	conf/evolutions/default/1.sql

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