Merge branch 'dev-sxw' of https://git.coding.net/virusdefender/qduoj

Conflicts:
	contest/views.py
	template/src/oj/contest/contest_rank.html
	template/src/oj/contest/submissions_list.html

utils/views.py

@@ -29,8 +29,8 @@ class SimditorImageUploadAPIView(APIView):
             return Response(data={
                 "success": True,
                 "msg": "上传错误",
-                "file_path": "/static/upload_image/" + image_name})
+                "file_path": "/static/upload/" + image_name})
         return Response(data={
             "success": True,
             "msg": "",
-            "file_path": "/static/upload_image/" + image_name})
+            "file_path": "/static/upload/" + image_name})