[Modify Feature]
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/school/views/scripts/studentdeal/list.phtml