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

static/src/js/app/admin/admin.js

@@ -1,4 +1,4 @@
-define("admin", ["jquery", "avalon"], function ($, avalon) {
+require(["jquery", "avalon", "bootstrap"], function ($, avalon) {
 
     avalon.ready(function () {
 

static/src/js/app/oj/problem/problem_list.js

@@ -1,6 +0,0 @@
-require(["jquery", "avalon"], function($, avalon){
-    var vm = avalon.define({
-        $id: "problem_list",
-        problem_list: []
-    })
-});