Merge branch 'dev' into virusdefender-dev

* dev:
  ‰øƧ‰øÆÊîπ‰∫ÜÊ∑ªÂä†ÈóÆÈ¢òÈ°µÈù¢jsÂèòÈáèÂêç,Ê∑ªÂä†ÈóÆÈ¢òÂäüËÉΩÊ≠£Â∏∏[CI SKIP]
  修改/oj/local_settings.py中的test_case上传路径,修复测试用例存储错误的bug

Conflicts:
	oj/local_settings.py
	template/admin/problem/add_problem.html

static/src/js/app/admin/problem/add_problem.js

@@ -18,7 +18,7 @@ require(["jquery", "avalon", "editor", "uploader", "bsAlert", "csrfToken", "tagE
                                 }
                             }
                         },
-                        cpu: {
+                        timeLimit: {
                             validators: {
                                 notEmpty: {
                                     message: "请输入时间限制"
@@ -34,7 +34,7 @@ require(["jquery", "avalon", "editor", "uploader", "bsAlert", "csrfToken", "tagE
                                 }
                             }
                         },
-                        memory: {
+                        memoryLimit: {
                             validators: {
                                 notEmpty: {
                                     message: "请输入内存限制"
@@ -215,4 +215,4 @@ require(["jquery", "avalon", "editor", "uploader", "bsAlert", "csrfToken", "tagE
             });
         });
         avalon.scan();
-    });
+    });