修改用户属性设置页面,添加学校字段,合并了一些冲突

account/migrations/0014_auto_20151110_1037.py

@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('account', '0013_userprofile'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='userprofile',
+            name='phone_number',
+            field=models.CharField(max_length=15, null=True, blank=True),
+        ),
+        migrations.AddField(
+            model_name='userprofile',
+            name='school',
+            field=models.CharField(max_length=200, null=True, blank=True),
+        ),
+    ]