提交，UI
OK
Merge branch 'master' of https://github.com/worldjingsai/code

Conflicts:
	app/controllers/contest.php