diff --git a/access/models.py b/access/models.py
index 9735915..e4bfae5 100755
--- a/access/models.py
+++ b/access/models.py
@@ -345,10 +345,10 @@ class User(AbstractBaseUser):
 
     def check_phone(self, _type='actual'): # actual = self.phone, back = self.back_phone
         phone = self.phone if _type == 'actual' else self.back_phone
-        return bool(len(''.join([n for n in phone if n in [str(x) for x in xrange(0,10)]])) > 9)
+        return bool(len(''.join([n for n in phone if n in [str(x) for x in range(0,10)]])) > 9)
 
     def clean_phone(self, _type='actual'):
-        return ''.join([n for n in self.phone if n in [str(x) for x in xrange(0,10)]]) if self.check_phone() else ''
+        return ''.join([n for n in self.phone if n in [str(x) for x in range(0,10)]]) if self.check_phone() else ''
             
 
     class Meta:
diff --git a/courses/models.py b/courses/models.py
index fd25d8c..72c1a6e 100755
--- a/courses/models.py
+++ b/courses/models.py
@@ -33,7 +33,7 @@ class MaterialDirection(models.Model):
     title = models.CharField(verbose_name=u'Заголовок', max_length=255)
     color = models.CharField(verbose_name=u'Цвет', max_length=50)
     description = RedactorField(verbose_name=u'Описание', blank=True)
-    mentors = models.ManyToManyField(User, verbose_name=u'Кураторы', null=True)
+    mentors = models.ManyToManyField(User, verbose_name=u'Кураторы')
 
     def __unicode__(self):
         return u'%s' % self.title
@@ -75,7 +75,7 @@ class Course(models.Model):
     slug = models.SlugField(max_length=255, editable=False, blank=True, default='', unique=True)
     icon = models.ImageField(verbose_name=u'Иконка курса', blank=True, null=True, upload_to='course')
     direction = models.ForeignKey(MaterialDirection, verbose_name=u'Направление', null=True)
-    mentors = models.ManyToManyField(User, verbose_name=u'Кураторы', null=True, blank=True, related_name='course_mentors')
+    mentors = models.ManyToManyField(User, verbose_name=u'Кураторы', blank=True, related_name='course_mentors')
     public = models.BooleanField(verbose_name=u'Опубликовать', default=False)
     title = models.CharField(verbose_name=u"Заголовок", max_length=255)
     description = RedactorField(verbose_name=u'Описание', blank=True)
@@ -732,7 +732,7 @@ class AchievementsMap(models.Model):
 
 
 class Diploma(models.Model):
-    key = models.IntegerField(verbose_name=u'Последний ключ', max_length=255)
+    key = models.IntegerField(verbose_name=u'Последний ключ')
     icon = models.ImageField(verbose_name=u'Мини картинка', upload_to='diploms', null=True)
     course = models.ForeignKey(Course, verbose_name=u'Курс')
     out_image = models.ImageField(verbose_name=u'Диплом без печати', upload_to='diploms')
@@ -743,21 +743,21 @@ class Diploma(models.Model):
     date_color = models.CharField(verbose_name=u'Цвет даты', max_length=255, null=True,
                                   help_text=u'RGB. Пример: 0,0,0')
     date_font = models.FileField(verbose_name=u'Шрифт даты', upload_to='diploms', null=True)
-    date_size = models.IntegerField(verbose_name=u'Размер даты', max_length=255, null=True)
+    date_size = models.IntegerField(verbose_name=u'Размер даты', null=True)
     #
     key_place = models.CharField(verbose_name=u'Размещение ключа', max_length=255, null=True,
                                  help_text=u'Пикселей сверху:пикселей слева - 256:256')
     key_color = models.CharField(verbose_name=u'Цвет ключа', max_length=255, null=True,
                                  help_text=u'RGB. Пример: 0,0,0')
     key_font = models.FileField(verbose_name=u'Шрифт ключа', upload_to='diploms', null=True)
-    key_size = models.IntegerField(verbose_name=u'Размер ключа', max_length=255, null=True)
+    key_size = models.IntegerField(verbose_name=u'Размер ключа', null=True)
     #
     name_place = models.CharField(verbose_name=u'Размещение имени', max_length=255, null=True,
                                   help_text=u'Пикселей сверху:пикселей слева - 256:256')
     name_color = models.CharField(verbose_name=u'Цвет имени', max_length=255, null=True,
                                   help_text=u'RGB. Пример: 0,0,0')
     name_font = models.FileField(verbose_name=u'Шрифт имени', upload_to='diploms', null=True)
-    name_size = models.IntegerField(verbose_name=u'Размер имени', max_length=255, null=True)
+    name_size = models.IntegerField(verbose_name=u'Размер имени', null=True)
 
     def __str__(self):
         return '%s' % self.course
@@ -973,3 +973,8 @@ class Flow(models.Model):
         verbose_name = u'Поток'
         verbose_name_plural = u'Потоки'
         ordering = ['-modified']
+
+
+class NormalMap(models.Model):
+    course = models.OneToOneField(to=Course)
+    json_tree = models.TextField(default='')
diff --git a/finance/models.py b/finance/models.py
index 3ac1b01..e67ccb8 100755
--- a/finance/models.py
+++ b/finance/models.py
@@ -30,7 +30,7 @@ class Installment(models.Model):
                                                                                         u'предоставлять доступ после '
                                                                                         u'просрочки')
     expired = models.BooleanField(verbose_name=u'Просрочено', default=False)
-    payments = models.ManyToManyField('Bill', verbose_name=u'Платежи', blank=True, null=True, related_name='bill_point')
+    payments = models.ManyToManyField('Bill', verbose_name=u'Платежи', blank=True, related_name='bill_point')
 
     def __str__(self):
         return '%s %s' % (self.user, self.price)
@@ -54,7 +54,7 @@ class Price(models.Model):
     cost = models.IntegerField(verbose_name=u'Цена')
     course = models.ForeignKey(Course, verbose_name=u'Курс', null=True, blank=True)
     description = models.TextField(verbose_name=u'Описание', help_text=u'Будет показано менеджерам')
-    included = models.ManyToManyField(CourseMap, verbose_name=u'Включены', null=True, blank=True,
+    included = models.ManyToManyField(CourseMap, verbose_name=u'Включены', blank=True,
                                       help_text=u'Если задействовать эту функцию, стандартная схема подписок будет '
                                                 u'не активна')
     by_time = models.IntegerField(verbose_name=u'Дней доступа', default=0, blank=True, null=True,
@@ -157,8 +157,8 @@ class Bill(models.Model):
     fire_date_sent = models.BooleanField(verbose_name=u'Письмо сгорания', default=False, editable=False)
     modals_show = models.BooleanField(verbose_name=u'Модалки показаны', default=False, editable=False)
     created_sent = models.BooleanField(verbose_name=u'Отправлено письмо сформированного счета', default=False, editable=False)
-    create_letters = models.ManyToManyField(MailBox, verbose_name=u'Письма при создании', null=True, blank=True, related_name='bill_create_letter', editable=False)
-    finish_letters = models.ManyToManyField(MailBox, verbose_name=u'Письма завершения', null=True, blank=True, related_name='bill_finish_letter', editable=False)
+    create_letters = models.ManyToManyField(MailBox, verbose_name=u'Письма при создании', blank=True, related_name='bill_create_letter', editable=False)
+    finish_letters = models.ManyToManyField(MailBox, verbose_name=u'Письма завершения', blank=True, related_name='bill_finish_letter', editable=False)
 
     def __unicode__(self):
         return u'%s:%s %s %s' % (self.id, self.get_status_display(), self.user, self.manager if self.manager else '')
@@ -444,7 +444,7 @@ class ServiceRequest(models.Model):
 
 class RequestAlert(models.Model):
     title = models.CharField(verbose_name=u'Классификатор', max_length=255, editable=False)
-    requests = models.ManyToManyField(ServiceRequest, verbose_name=u'Количество заявок', blank=True, null=True, editable=False)
+    requests = models.ManyToManyField(ServiceRequest, verbose_name=u'Количество заявок', blank=True, editable=False)
     mails = models.TextField(verbose_name=u'Список почт', blank=True,
                              help_text=u'Кому разослать дубли заявки. ЧЕРЕЗ ТОЧКУ С ЗАПЯТОЙ')
     date = models.DateTimeField(verbose_name=u'Начало заявок', default=datetime.datetime.now, editable=False)
diff --git a/journals/models.py b/journals/models.py
index d37b418..a59b725 100755
--- a/journals/models.py
+++ b/journals/models.py
@@ -43,7 +43,7 @@ class TeacherJ(models.Model):
     start_date = models.DateTimeField(verbose_name=u'Дата начала', blank=True, null=True)
     opens = models.ManyToManyField(CourseMap, verbose_name=u'Насильные открытия', blank=True, editable=False,
                                    related_name='map_opens')
-    waiting = models.ManyToManyField(CourseMap, verbose_name=u'Доп изучения', blank=True, null=True,
+    waiting = models.ManyToManyField(CourseMap, verbose_name=u'Доп изучения', blank=True,
                                      related_name='map_waiting')
 
     def __str__(self):
diff --git a/library/models.py b/library/models.py
index 94bad25..3dd0c20 100755
--- a/library/models.py
+++ b/library/models.py
@@ -36,12 +36,12 @@ class Article(models.Model):
     css = models.TextField(verbose_name=u'CSS', blank=True, default='', help_text=u'Можно добавлять все, но только исправить http на https')
     js = models.TextField(verbose_name=u'JS', blank=True, default='', help_text=u'Удалить bootstrap, jquery и заменить http на https')
     date = models.DateTimeField(verbose_name=u'Дата публикации', default=datetime.datetime.now, editable=False)
-    tags = models.ManyToManyField('Tags', verbose_name=u'Теги', blank=True, null=True)
-    likes = models.ManyToManyField(User, verbose_name=u'Лайки', max_length=255, null=True, blank=True, editable=False, related_name=u'acticle_likes')
+    tags = models.ManyToManyField('Tags', verbose_name=u'Теги', blank=True)
+    likes = models.ManyToManyField(User, verbose_name=u'Лайки', max_length=255, blank=True, editable=False, related_name=u'acticle_likes')
     views = models.ManyToManyField(User, verbose_name=u'Просмотры', max_length=255, default=0, related_name='article_views', editable=False)
     all_views = models.IntegerField(verbose_name=u'Всего просмотров', default=0, blank=True)
-    comments = models.ManyToManyField(Comment, verbose_name=u'Комментарии', null=True, blank=True, editable=False)
-    favorite = models.ManyToManyField(User, verbose_name=u'В фаворитах', blank=True, null=True, related_name='article_as_favorites', editable=False)
+    comments = models.ManyToManyField(Comment, verbose_name=u'Комментарии', blank=True, editable=False)
+    favorite = models.ManyToManyField(User, verbose_name=u'В фаворитах', blank=True, related_name='article_as_favorites', editable=False)
 
     def __str__(self): return '%s' % self.title
 
diff --git a/management/models.py b/management/models.py
index 3333cec..2594365 100755
--- a/management/models.py
+++ b/management/models.py
@@ -154,8 +154,8 @@ class Comment(models.Model):
     date = models.DateTimeField(verbose_name=u'Отправка', default=datetime.datetime.now)
     files = models.ManyToManyField(Storage, verbose_name=u'Прикрепленые файлы', blank=True, editable=False)
     send = models.BooleanField(verbose_name=u'Отправлено', default=False, editable=False)
-    replies = models.ManyToManyField('self', verbose_name=u'Ответы', blank=True, null=True, related_name='all_text_response', editable=False)
-    answers = models.ManyToManyField('self', verbose_name=u'Форумные ответы', blank=True, null=True, related_name='forum_answers', editable=False)
+    replies = models.ManyToManyField('self', verbose_name=u'Ответы', blank=True, related_name='all_text_response', editable=False)
+    answers = models.ManyToManyField('self', verbose_name=u'Форумные ответы', blank=True, related_name='forum_answers', editable=False)
 
     def __unicode__(self):
         return str(self.id)
@@ -329,7 +329,7 @@ class Faq(models.Model):
     question = models.CharField(verbose_name=u'Вопрос', max_length=255)
     answer = RedactorField(verbose_name=u'Ответ')
     rating = models.IntegerField(verbose_name=u'Рейтинг статьи', default=0)
-    comments = models.ManyToManyField(Comment, verbose_name=u'Комментарии', blank=True, null=True, editable=False)
+    comments = models.ManyToManyField(Comment, verbose_name=u'Комментарии', blank=True, editable=False)
     date = models.DateTimeField(verbose_name=u'Дата создания', default=datetime.datetime.now, editable=False)
 
     def __str__(self):
diff --git a/practice/models.py b/practice/models.py
index d2fc2a1..1fcb7aa 100644
--- a/practice/models.py
+++ b/practice/models.py
@@ -53,7 +53,7 @@ class DataSheet(models.Model):
     data = models.TextField(verbose_name=u'Данные')
     split_char = models.CharField(verbose_name=u'Разделяющий символ', max_length=10, default=', ', blank=True)
     date = models.DateTimeField(verbose_name=u'Дата создания', default=datetime.datetime.now, editable=False)
-    users = models.ManyToManyField(User, verbose_name=u'Пользователи', blank=True, null=True, editable=False)
+    users = models.ManyToManyField(User, verbose_name=u'Пользователи', blank=True, editable=False)
 
     def __unicode__(self):
         return u'%s' % self.title
@@ -117,13 +117,13 @@ class Workshop(models.Model):
     content = RedactorField(verbose_name=u'Описание методов', blank=True, default='',
                                help_text=u'Добавление в /<body/>, после описаний и решений')
     variables = RedactorField(verbose_name=u'Описание переменных', blank=True, default='')
-    tools = models.ManyToManyField(WorkshopTools, verbose_name=u'Используемые инструменты', blank=True, null=True)
+    tools = models.ManyToManyField(WorkshopTools, verbose_name=u'Используемые инструменты', blank=True)
     open_resolve = models.BooleanField(verbose_name=u'Открыть ответ', default=False)
     resolve = RedactorField(verbose_name=u'Ответ', blank=True, default='')
     will_open_resolve = models.DateTimeField(verbose_name=u'Открыть ответ в дату', blank=True, null=True,
                                              help_text=u'Доступ к ответу открыть в указанную дату, если это вообще нужно')
     date = models.DateTimeField(verbose_name=u'Дата создания', default=datetime.datetime.now, editable=False)
-    users = models.ManyToManyField(User, verbose_name=u'Пользователи', blank=True, null=True, editable=False)
+    users = models.ManyToManyField(User, verbose_name=u'Пользователи', blank=True, editable=False)
     views = models.IntegerField(verbose_name=u'Просмотров комнаты', default=0)
 
     def __unicode__(self):