Merge branch 'dev-s' into virusdefender-dev

* dev-s:
  小调整，修改addContest的小bug，
  修复小bug，仿照problem GET添加获取单个比赛信息的API
  添加后台编辑比赛页面[CI SKIP]

Conflicts:
	static/src/js/app/admin/contest/contestList.js
	static/src/js/app/admin/contest/editContest.js

problem/views.py

@@ -136,8 +136,8 @@ class ProblemAdminAPIView(APIView):
                 # 普通管理员只能获取自己创建的题目
                 # 超级管理员可以获取全部的题目
                 problem = Problem.objects.get(id=problem_id)
-                if request.user.admin_type != SUPER_ADMIN:
-                    problem = problem.get(created_by=request.user)
+                if request.user.admin_type != SUPER_ADMIN and problem.created_by != request.user:
+                    return error_response(u"题目不存在")
                 return success_response(ProblemSerializer(problem).data)
             except Problem.DoesNotExist:
                 return error_response(u"题目不存在")