contest_submission&problem
Merge branch 'master' of https://github.com/casparchen/SCPC-TS

Conflicts:
	application/views.py