Signed-off-by: cst <cst8588092@yahoo.com.cn>
Merge branch 'master' of https://github.com/MonsterStorm/Play_AdmissionsDistribution.git

Conflicts:
	app/models/TemplateType.java

Signed-off-by: cst <cst8588092@yahoo.com.cn>