Merge branch 'edx-release' into django-migrations

problem_builder/migrations/0001_initial.py

+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Answer',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('name', models.CharField(max_length=50, db_index=True)),
+                ('student_id', models.CharField(max_length=32, db_index=True)),
+                ('course_id', models.CharField(max_length=50, db_index=True)),
+                ('student_input', models.TextField(default=b'', blank=True)),
+                ('created_on', models.DateTimeField(auto_now_add=True, verbose_name=b'created on')),
+                ('modified_on', models.DateTimeField(auto_now=True, verbose_name=b'modified on')),
+            ],
+        ),
+        migrations.AlterUniqueTogether(
+            name='answer',
+            unique_together=set([('student_id', 'course_id', 'name')]),
+        ),
+    ]