Merge branch 'hohoTT-dev' into virusdefender-dev

* hohoTT-dev:
  前台比赛、比赛题目与普通题目的一系列界面

Conflicts:
	submission/views.py
	template/oj/contest/contest_problem.html
	template/oj/problem/my_submission.html

template/oj/problem/my_submission.html

@@ -12,12 +12,23 @@
         <ul class="nav nav-tabs nav-tabs-google">
             <li role="presentation">
                 {% if submission.contest_id %}
+
                     <a href="/contest/{{ submission.contest_id }}/problem/{{ problem.id }}/">题目</a>
+
                 {% else %}
-                <a href="/problem/{{ problem.id }}/">题目</a>
+                    <a href="/problem/{{ problem.id }}/">题目</a>
                 {% endif %}
             </li>
-            <li role="presentation" class="active"><a href="/problem/{{ problem.id }}/my_submissions/">我的提交</a></li>
+
+
+            <li role="presentation" class="active">
+                {% if submission.contest_id %}
+                    <a href="/contest/{{ submission.contest_id }}/problem/{{ problem.id }}/submissions/">我的提交</a>
+                {% else %}
+                    <a href="/problem/{{ problem.id }}/submissions/">我的提交</a>
+                {% endif %}
+            </li>
+
         </ul>
         {% include "oj/problem/_problem_header.html" %}
         <div class="panel panel-default">