Merge branch 'dev' into virusdefender-dev

* dev:
  修改后端problem中的的命名规范
  前端创建题目界面增加输入描述和输出描述
  后端增加输入描述与输出描述两个字段，并修改其相关的后端内容

problem/migrations/0004_auto_20150813_1459.py

@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('problem', '0003_auto_20150810_2233'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='problem',
+            name='description_input',
+            field=models.CharField(default='hello', max_length=10000),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name='problem',
+            name='description_output',
+            field=models.CharField(default='hello', max_length=10000),
+            preserve_default=False,
+        ),
+    ]

problem/migrations/0005_auto_20150813_1807.py

@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('problem', '0004_auto_20150813_1459'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='problem',
+            old_name='description_input',
+            new_name='input_description',
+        ),
+        migrations.RenameField(
+            model_name='problem',
+            old_name='description_output',
+            new_name='output_description',
+        ),
+    ]