diff --git a/core/admin.py b/core/admin.py
index 4881288..dcba4fb 100644
--- a/core/admin.py
+++ b/core/admin.py
@@ -1,6 +1,6 @@
 from django.contrib import admin
 
-from .models import Action, Resource, Action_Resource, Log
+from .models import Action, Resource, Action_Resource, Log, MymeType
 
 class ActionAdmin(admin.ModelAdmin):
 	list_display = ['name', 'created_date']
@@ -18,7 +18,12 @@ class LogAdmin(admin.ModelAdmin):
 	list_display = ['datetime', 'user', 'action_resource']
 	search_fields = ['user']
 
+class MymeTypeAdmin(admin.ModelAdmin):
+	list_display = ['typ', 'icon']
+	search_fields = ['typ', 'icon']
+
 admin.site.register(Action, ActionAdmin)
 admin.site.register(Resource, ResourceAdmin)
 admin.site.register(Action_Resource, ActionResourceAdmin)
-admin.site.register(Log, LogAdmin)
\ No newline at end of file
+admin.site.register(Log, LogAdmin)
+admin.site.register(MymeType, MymeTypeAdmin)
\ No newline at end of file
diff --git a/core/migrations/0001_initial.py b/core/migrations/0001_initial.py
index 4a98a5b..f9418e1 100644
--- a/core/migrations/0001_initial.py
+++ b/core/migrations/0001_initial.py
@@ -1,9 +1,8 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.10 on 2016-10-05 13:37
+# Generated by Django 1.10 on 2016-10-17 15:49
 from __future__ import unicode_literals
 
 import autoslug.fields
-from django.conf import settings
 from django.db import migrations, models
 import django.db.models.deletion
 
@@ -13,7 +12,6 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
     ]
 
     operations = [
@@ -25,19 +23,18 @@ class Migration(migrations.Migration):
                 ('created_date', models.DateField(auto_now_add=True, verbose_name='Created Date')),
             ],
             options={
-                'verbose_name': 'Action',
                 'verbose_name_plural': 'Actions',
+                'verbose_name': 'Action',
             },
         ),
         migrations.CreateModel(
             name='Action_Resource',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('action', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Action', verbose_name='Action_Applied')),
             ],
             options={
-                'verbose_name': 'Action_Resource',
                 'verbose_name_plural': 'Action_Resources',
+                'verbose_name': 'Action_Resource',
             },
         ),
         migrations.CreateModel(
@@ -45,12 +42,22 @@ class Migration(migrations.Migration):
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('datetime', models.DateTimeField(auto_now_add=True, verbose_name='Date and Time of action')),
-                ('action_resource', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Action_Resource', verbose_name='Action_Resource')),
-                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Actor')),
             ],
             options={
-                'verbose_name': 'Log',
                 'verbose_name_plural': 'Logs',
+                'verbose_name': 'Log',
+            },
+        ),
+        migrations.CreateModel(
+            name='MymeType',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('typ', models.CharField(max_length=100, unique=True, verbose_name='Type')),
+                ('icon', models.CharField(max_length=50, unique=True, verbose_name='Icon')),
+            ],
+            options={
+                'verbose_name_plural': 'Amadeus Myme Types',
+                'verbose_name': 'Amadeus Myme Type',
             },
         ),
         migrations.CreateModel(
@@ -61,12 +68,10 @@ class Migration(migrations.Migration):
                 ('read', models.BooleanField(default=False, verbose_name='Read')),
                 ('datetime', models.DateTimeField(auto_now_add=True, verbose_name='Date and Time of action')),
                 ('action_resource', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Action_Resource', verbose_name='Action_Resource')),
-                ('actor', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='notification_Performer', to=settings.AUTH_USER_MODEL, verbose_name='Perfomer')),
-                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='notification_Actor', to=settings.AUTH_USER_MODEL, verbose_name='User')),
             ],
             options={
-                'verbose_name': 'Notification',
                 'verbose_name_plural': 'Notifications',
+                'verbose_name': 'Notification',
             },
         ),
         migrations.CreateModel(
@@ -79,13 +84,8 @@ class Migration(migrations.Migration):
                 ('url', models.CharField(default='', max_length=100, verbose_name='URL')),
             ],
             options={
-                'verbose_name': 'Resource',
                 'verbose_name_plural': 'Resources',
+                'verbose_name': 'Resource',
             },
         ),
-        migrations.AddField(
-            model_name='action_resource',
-            name='resource',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Resource', verbose_name='Resource'),
-        ),
     ]
diff --git a/core/migrations/0002_auto_20161017_1249.py b/core/migrations/0002_auto_20161017_1249.py
new file mode 100644
index 0000000..608f951
--- /dev/null
+++ b/core/migrations/0002_auto_20161017_1249.py
@@ -0,0 +1,50 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2016-10-17 15:49
+from __future__ import unicode_literals
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ('core', '0001_initial'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='notification',
+            name='actor',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='notification_Performer', to=settings.AUTH_USER_MODEL, verbose_name='Perfomer'),
+        ),
+        migrations.AddField(
+            model_name='notification',
+            name='user',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='notification_Actor', to=settings.AUTH_USER_MODEL, verbose_name='User'),
+        ),
+        migrations.AddField(
+            model_name='log',
+            name='action_resource',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Action_Resource', verbose_name='Action_Resource'),
+        ),
+        migrations.AddField(
+            model_name='log',
+            name='user',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Actor'),
+        ),
+        migrations.AddField(
+            model_name='action_resource',
+            name='action',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Action', verbose_name='Action_Applied'),
+        ),
+        migrations.AddField(
+            model_name='action_resource',
+            name='resource',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Resource', verbose_name='Resource'),
+        ),
+    ]
diff --git a/core/migrations/0002_mymetype.py b/core/migrations/0002_mymetype.py
deleted file mode 100644
index a813883..0000000
--- a/core/migrations/0002_mymetype.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.10 on 2016-10-12 17:29
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('core', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='MymeType',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('typ', models.CharField(max_length=100, unique=True, verbose_name='Type')),
-                ('icon', models.CharField(max_length=50, unique=True, verbose_name='Icon')),
-            ],
-            options={
-                'verbose_name_plural': 'Amadeus Myme Types',
-                'verbose_name': 'Amadeus Myme Type',
-            },
-        ),
-    ]
diff --git a/courses/admin.py b/courses/admin.py
index e5e1b46..af61d38 100644
--- a/courses/admin.py
+++ b/courses/admin.py
@@ -1,11 +1,15 @@
 from django.contrib import admin
 
-from .models import CourseCategory, Course, Subject,Topic, Activity, Material
+from .models import CourseCategory, Course, Subject,Topic, Activity, Material, CategorySubject
 
 class CategoryAdmin(admin.ModelAdmin):
 	list_display = ['name', 'slug']
 	search_fields = ['name', 'slug']
 
+class CategorySubjectAdmin(admin.ModelAdmin):
+	list_display = ['name', 'slug']
+	search_fields = ['name', 'slug']
+
 class CourseAdmin(admin.ModelAdmin):
 	list_display = ['name', 'slug']
 	search_fields = ['name', 'slug']
@@ -32,3 +36,4 @@ admin.site.register(Subject, SubjectAdmin)
 admin.site.register(Topic, TopicAdmin)
 admin.site.register(Activity,ActivityAdmin)
 admin.site.register(Material,MaterialAdmin)
+admin.site.register(CategorySubject, CategorySubjectAdmin)
diff --git a/courses/forms.py b/courses/forms.py
index 826f15b..5d18c1c 100644
--- a/courses/forms.py
+++ b/courses/forms.py
@@ -192,7 +192,7 @@ class ActivityForm(forms.ModelForm):
 class FileMaterialForm(forms.ModelForm):  
   class Meta:
     model = FileMaterial
-    fields = ['material', 'file', 'name']
+    fields = ['name', 'file']
 
 class LinkMaterialForm(forms.ModelForm):  
   class Meta:
diff --git a/courses/migrations/0001_initial.py b/courses/migrations/0001_initial.py
index ed91baf..f9694bc 100644
--- a/courses/migrations/0001_initial.py
+++ b/courses/migrations/0001_initial.py
@@ -1,9 +1,8 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.10 on 2016-10-05 13:37
+# Generated by Django 1.10 on 2016-10-17 15:49
 from __future__ import unicode_literals
 
 import autoslug.fields
-from django.conf import settings
 from django.db import migrations, models
 import django.db.models.deletion
 import s3direct.fields
@@ -14,7 +13,6 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
         ('core', '0001_initial'),
     ]
 
@@ -23,9 +21,8 @@ class Migration(migrations.Migration):
             name='Activity',
             fields=[
                 ('resource_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='core.Resource')),
-                ('limit_date', models.DateTimeField(verbose_name='Deliver Date')),
+                ('limit_date', models.DateField(verbose_name='Deliver Date')),
                 ('all_students', models.BooleanField(default=False, verbose_name='All Students')),
-                ('students', models.ManyToManyField(related_name='activities', to=settings.AUTH_USER_MODEL, verbose_name='Students')),
             ],
             bases=('core.resource',),
         ),
@@ -35,15 +32,14 @@ class Migration(migrations.Migration):
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('pdf', s3direct.fields.S3DirectField()),
                 ('name', models.CharField(max_length=100)),
-                ('diet', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='files', to='courses.Activity')),
             ],
             options={
-                'verbose_name': 'Activity File',
                 'verbose_name_plural': 'Activitys Files',
+                'verbose_name': 'Activity File',
             },
         ),
         migrations.CreateModel(
-            name='Category',
+            name='CategorySubject',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('name', models.CharField(max_length=100, unique=True, verbose_name='Name')),
@@ -51,8 +47,8 @@ class Migration(migrations.Migration):
                 ('create_date', models.DateField(auto_now_add=True, verbose_name='Creation Date')),
             ],
             options={
-                'verbose_name': 'Category',
                 'verbose_name_plural': 'Categories',
+                'verbose_name': 'Category',
             },
         ),
         migrations.CreateModel(
@@ -70,22 +66,48 @@ class Migration(migrations.Migration):
                 ('init_date', models.DateField(verbose_name='Begin of Course Date')),
                 ('end_date', models.DateField(verbose_name='End of Course Date')),
                 ('image', models.ImageField(blank=True, upload_to='courses/', verbose_name='Image')),
-                ('category', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='courses.Category', verbose_name='Category')),
-                ('professors', models.ManyToManyField(related_name='courses_professors', to=settings.AUTH_USER_MODEL, verbose_name='Professors')),
-                ('students', models.ManyToManyField(related_name='courses_student', to=settings.AUTH_USER_MODEL, verbose_name='Students')),
             ],
             options={
-                'verbose_name': 'Course',
                 'ordering': ('create_date', 'name'),
                 'verbose_name_plural': 'Courses',
+                'verbose_name': 'Course',
             },
         ),
         migrations.CreateModel(
+            name='CourseCategory',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=100, unique=True, verbose_name='Name')),
+                ('slug', autoslug.fields.AutoSlugField(editable=False, populate_from='name', unique=True, verbose_name='Slug')),
+                ('create_date', models.DateField(auto_now_add=True, verbose_name='Creation Date')),
+            ],
+            options={
+                'verbose_name_plural': 'Categories',
+                'verbose_name': 'Category',
+            },
+        ),
+        migrations.CreateModel(
+            name='FileMaterial',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('file', models.FileField(upload_to='uploads/%Y/%m/%d')),
+                ('name', models.CharField(max_length=100)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='LinkMaterial',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=100)),
+                ('description', models.TextField()),
+                ('url', models.URLField(max_length=300, verbose_name='Link')),
+            ],
+        ),
+        migrations.CreateModel(
             name='Material',
             fields=[
                 ('resource_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='core.Resource')),
                 ('all_students', models.BooleanField(default=False, verbose_name='All Students')),
-                ('students', models.ManyToManyField(related_name='materials', to=settings.AUTH_USER_MODEL, verbose_name='Students')),
             ],
             bases=('core.resource',),
         ),
@@ -101,13 +123,11 @@ class Migration(migrations.Migration):
                 ('end_date', models.DateField(verbose_name='End of Subject Date')),
                 ('create_date', models.DateTimeField(auto_now_add=True, verbose_name='Creation Date')),
                 ('update_date', models.DateTimeField(auto_now=True, verbose_name='Date of last update')),
-                ('course', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='subjects', to='courses.Course', verbose_name='Course')),
-                ('professors', models.ManyToManyField(related_name='subjects', to=settings.AUTH_USER_MODEL, verbose_name='Professors')),
             ],
             options={
-                'verbose_name': 'Subject',
                 'ordering': ('create_date', 'name'),
                 'verbose_name_plural': 'Subjects',
+                'verbose_name': 'Subject',
             },
         ),
         migrations.CreateModel(
@@ -117,11 +137,10 @@ class Migration(migrations.Migration):
                 ('name', models.CharField(max_length=100, verbose_name='Name')),
                 ('slug', autoslug.fields.AutoSlugField(editable=False, populate_from='name', unique=True, verbose_name='Slug')),
                 ('description', models.TextField(blank=True, verbose_name='Description')),
-                ('subjects', models.ManyToManyField(to='courses.Subject')),
             ],
             options={
-                'verbose_name': 'subject category',
                 'verbose_name_plural': 'subject categories',
+                'verbose_name': 'subject category',
             },
         ),
         migrations.CreateModel(
@@ -134,23 +153,11 @@ class Migration(migrations.Migration):
                 ('create_date', models.DateTimeField(auto_now_add=True, verbose_name='Creation Date')),
                 ('update_date', models.DateTimeField(auto_now=True, verbose_name='Date of last update')),
                 ('visible', models.BooleanField(default=False, verbose_name='Visible')),
-                ('owner', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Owner')),
-                ('subject', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='courses.Subject', verbose_name='Subject')),
             ],
             options={
-                'verbose_name': 'Topic',
                 'ordering': ('create_date', 'name'),
                 'verbose_name_plural': 'Topics',
+                'verbose_name': 'Topic',
             },
         ),
-        migrations.AddField(
-            model_name='material',
-            name='topic',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='materials', to='courses.Topic', verbose_name='Topic'),
-        ),
-        migrations.AddField(
-            model_name='activity',
-            name='topic',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='activities', to='courses.Topic', verbose_name='Topic'),
-        ),
     ]
diff --git a/courses/migrations/0002_auto_20161017_1249.py b/courses/migrations/0002_auto_20161017_1249.py
new file mode 100644
index 0000000..d2ad680
--- /dev/null
+++ b/courses/migrations/0002_auto_20161017_1249.py
@@ -0,0 +1,105 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2016-10-17 15:49
+from __future__ import unicode_literals
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ('courses', '0001_initial'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='topic',
+            name='owner',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Owner'),
+        ),
+        migrations.AddField(
+            model_name='topic',
+            name='subject',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='courses.Subject', verbose_name='Subject'),
+        ),
+        migrations.AddField(
+            model_name='subjectcategory',
+            name='subjects',
+            field=models.ManyToManyField(to='courses.Subject'),
+        ),
+        migrations.AddField(
+            model_name='subject',
+            name='category',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='subject_category', to='courses.CategorySubject', verbose_name='Category'),
+        ),
+        migrations.AddField(
+            model_name='subject',
+            name='course',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='subjects', to='courses.Course', verbose_name='Course'),
+        ),
+        migrations.AddField(
+            model_name='subject',
+            name='professors',
+            field=models.ManyToManyField(related_name='professors_subjects', to=settings.AUTH_USER_MODEL, verbose_name='Professors'),
+        ),
+        migrations.AddField(
+            model_name='subject',
+            name='students',
+            field=models.ManyToManyField(related_name='subject_student', to=settings.AUTH_USER_MODEL, verbose_name='Students'),
+        ),
+        migrations.AddField(
+            model_name='material',
+            name='students',
+            field=models.ManyToManyField(related_name='materials', to=settings.AUTH_USER_MODEL, verbose_name='Students'),
+        ),
+        migrations.AddField(
+            model_name='material',
+            name='topic',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='materials', to='courses.Topic', verbose_name='Topic'),
+        ),
+        migrations.AddField(
+            model_name='linkmaterial',
+            name='material',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='material_link', to='courses.Material', verbose_name='Material'),
+        ),
+        migrations.AddField(
+            model_name='filematerial',
+            name='material',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='material_file', to='courses.Material', verbose_name='Material'),
+        ),
+        migrations.AddField(
+            model_name='course',
+            name='category',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='course_category', to='courses.CourseCategory', verbose_name='Category'),
+        ),
+        migrations.AddField(
+            model_name='course',
+            name='professors',
+            field=models.ManyToManyField(related_name='courses_professors', to=settings.AUTH_USER_MODEL, verbose_name='Professors'),
+        ),
+        migrations.AddField(
+            model_name='course',
+            name='students',
+            field=models.ManyToManyField(related_name='courses_student', to=settings.AUTH_USER_MODEL, verbose_name='Students'),
+        ),
+        migrations.AddField(
+            model_name='activityfile',
+            name='diet',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='files', to='courses.Activity'),
+        ),
+        migrations.AddField(
+            model_name='activity',
+            name='students',
+            field=models.ManyToManyField(related_name='activities', to=settings.AUTH_USER_MODEL, verbose_name='Students'),
+        ),
+        migrations.AddField(
+            model_name='activity',
+            name='topic',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='activities', to='courses.Topic', verbose_name='Topic'),
+        ),
+    ]
diff --git a/courses/migrations/0002_subject_students.py b/courses/migrations/0002_subject_students.py
deleted file mode 100644
index cc00c9d..0000000
--- a/courses/migrations/0002_subject_students.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.10 on 2016-10-05 21:02
-from __future__ import unicode_literals
-
-from django.conf import settings
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ('courses', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='subject',
-            name='students',
-            field=models.ManyToManyField(related_name='subject_student', to=settings.AUTH_USER_MODEL, verbose_name='Students'),
-        ),
-    ]
diff --git a/courses/migrations/0003_auto_20161007_1612.py b/courses/migrations/0003_auto_20161007_1612.py
deleted file mode 100644
index 6ec5dd6..0000000
--- a/courses/migrations/0003_auto_20161007_1612.py
+++ /dev/null
@@ -1,30 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.10 on 2016-10-07 19:12
-from __future__ import unicode_literals
-
-from django.conf import settings
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('courses', '0002_subject_students'),
-    ]
-
-    operations = [
-        migrations.RenameModel(
-            old_name='Category',
-            new_name='CourseCategory',
-        ),
-        migrations.AlterField(
-            model_name='activity',
-            name='limit_date',
-            field=models.DateField(verbose_name='Deliver Date'),
-        ),
-        migrations.AlterField(
-            model_name='subject',
-            name='professors',
-            field=models.ManyToManyField(related_name='professors_subjects', to=settings.AUTH_USER_MODEL, verbose_name='Professors'),
-        ),
-    ]
diff --git a/courses/migrations/0004_auto_20161011_1951.py b/courses/migrations/0004_auto_20161011_1951.py
deleted file mode 100644
index 567bfa3..0000000
--- a/courses/migrations/0004_auto_20161011_1951.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.10 on 2016-10-11 22:51
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('courses', '0003_auto_20161007_1612'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='course',
-            name='category',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='course_category', to='courses.CourseCategory', verbose_name='Category'),
-        ),
-    ]
diff --git a/courses/migrations/0005_file.py b/courses/migrations/0005_file.py
deleted file mode 100644
index bd45634..0000000
--- a/courses/migrations/0005_file.py
+++ /dev/null
@@ -1,31 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.10 on 2016-10-13 17:29
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('core', '0002_mymetype'),
-        ('courses', '0004_auto_20161011_1951'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='File',
-            fields=[
-                ('material_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='courses.Material')),
-                ('description', models.TextField(blank=True, verbose_name='Description')),
-                ('content', models.FileField(upload_to='uploads/courses/subject/topic/%Y/%m/%d/')),
-                ('typ', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='file', to='core.MymeType', verbose_name='Type')),
-            ],
-            options={
-                'verbose_name': 'Topic file',
-                'verbose_name_plural': 'Topic files',
-            },
-            bases=('courses.material',),
-        ),
-    ]
diff --git a/courses/migrations/0006_auto_20161017_0117.py b/courses/migrations/0006_auto_20161017_0117.py
deleted file mode 100644
index ac44462..0000000
--- a/courses/migrations/0006_auto_20161017_0117.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.10 on 2016-10-17 04:17
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('core', '0002_mymetype'),
-        ('courses', '0005_file'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='file',
-            name='material_ptr',
-        ),
-        migrations.RemoveField(
-            model_name='file',
-            name='typ',
-        ),
-        migrations.DeleteModel(
-            name='File',
-        ),
-    ]
diff --git a/courses/migrations/0007_filematerial_linkmaterial.py b/courses/migrations/0007_filematerial_linkmaterial.py
deleted file mode 100644
index 05b13f9..0000000
--- a/courses/migrations/0007_filematerial_linkmaterial.py
+++ /dev/null
@@ -1,35 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.10 on 2016-10-17 04:55
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('courses', '0006_auto_20161017_0117'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='FileMaterial',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('file', models.FileField(upload_to='uploads/%Y/%m/%d')),
-                ('name', models.CharField(max_length=100)),
-                ('material', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='material_file', to='courses.Material', verbose_name='Material')),
-            ],
-        ),
-        migrations.CreateModel(
-            name='LinkMaterial',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(max_length=100)),
-                ('description', models.TextField()),
-                ('url', models.URLField(max_length=300, verbose_name='Link')),
-                ('material', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='material_link', to='courses.Material', verbose_name='Material')),
-            ],
-        ),
-    ]
diff --git a/courses/models.py b/courses/models.py
index 3ed8ef9..416983a 100644
--- a/courses/models.py
+++ b/courses/models.py
@@ -18,6 +18,18 @@ class CourseCategory(models.Model):
 	def __str__(self):
 		return self.name
 
+class CategorySubject(models.Model):
+	name = models.CharField(_('Name'), max_length=100, unique=True)
+	slug = AutoSlugField(_("Slug"), populate_from='name', unique=True)
+	create_date = models.DateField(_('Creation Date'), auto_now_add=True)
+
+	class Meta:
+		verbose_name = _('Category')
+		verbose_name_plural = _('Categories')
+
+	def __str__(self):
+		return self.name
+
 class Course(models.Model):
 
 	name = models.CharField(_('Name'), max_length = 100)
@@ -54,6 +66,7 @@ class Subject(models.Model):
 	create_date = models.DateTimeField(_('Creation Date'), auto_now_add = True)
 	update_date = models.DateTimeField(_('Date of last update'), auto_now=True)
 	course = models.ForeignKey(Course, verbose_name = _('Course'), related_name="subjects")
+	category = models.ForeignKey(CategorySubject, verbose_name = _('Category'), related_name='subject_category',null=True)
 	professors = models.ManyToManyField(User,verbose_name=_('Professors'), related_name='professors_subjects')
 	students = models.ManyToManyField(User,verbose_name=_('Students'), related_name='subject_student')
 
diff --git a/courses/static/js/material.js b/courses/static/js/material.js
new file mode 100644
index 0000000..f62bfdb
--- /dev/null
+++ b/courses/static/js/material.js
@@ -0,0 +1,82 @@
+function getCookie(name) {
+    var cookieValue = null;
+    if (document.cookie && document.cookie !== '') {
+        var cookies = document.cookie.split(';');
+        for (var i = 0; i < cookies.length; i++) {
+            var cookie = jQuery.trim(cookies[i]);
+            // Does this cookie string begin with the name we want?
+            if (cookie.substring(0, name.length + 1) === (name + '=')) {
+                cookieValue = decodeURIComponent(cookie.substring(name.length + 1));
+                break;
+            }
+        }
+    }
+    return cookieValue;
+}
+
+
+function createMaterial(url, topic) {
+    $.ajax({
+        url: url, 
+        data: {'topic': topic},
+        success: function(data) {
+            $(".material_form").html(data);
+            $("#id_topic").val(topic);
+
+            setMaterialCreateFormSubmit();
+        }
+    });
+
+    $("#editFileModal").modal();
+}
+
+function setMaterialCreateFormSubmit() {
+    
+    var frm = $('#material_create');
+    frm.submit(function () {
+        $.ajax({
+            type: frm.attr('method'),
+            url: frm.attr('action'),
+            data: frm.serialize(),
+            success: function (data) {
+                data = data.split('-');
+
+                $('.foruns_list').append("<li><i class='fa fa-commenting' aria-hidden='true'></i> <a id='forum_"+data[1]+"' href='"+data[0]+"'> "+data[2]+"</a></li>");
+
+                $("#createForum").modal('hide');
+
+                showForum(data[0], data[1]);
+            },
+            error: function(data) {
+                $(".forum_form").html(data.responseText);
+                setMaterialCreateFormSubmit();
+            }
+        });
+        return false;
+    });
+}
+
+function setMaterialUpdateFormSubmit(success_message) {
+
+    var frm = $('#material_create');
+    frm.submit(function () {
+        $.ajax({
+            type: frm.attr('method'),
+            url: frm.attr('action'),
+            data: frm.serialize(),
+            success: function (data) {
+                $('.forum_view').html(data);
+
+                alertify.success(success_message);
+
+                $("#editForum").modal('hide');
+            },
+            error: function(data) {
+                $(".forum_form").html(data.responseText);
+
+                setMaterialUpdateFormSubmit(success_message);
+            }
+        });
+        return false;
+    });
+}
\ No newline at end of file
diff --git a/courses/templates/course/view.html b/courses/templates/course/view.html
index 42e6a05..19ee62f 100644
--- a/courses/templates/course/view.html
+++ b/courses/templates/course/view.html
@@ -48,7 +48,14 @@
 {% endblock %}
 
 {% block content %}
-
+<div class="col-md-12">
+    <div class="btn-group btn-group-justified btn-group-raised">
+      <a href="?category=all" class="btn btn-raised btn-info">Todos</a>
+      {% for category_subject in categorys_subjects %}
+        <a href="?category={{category_subject.name}}" class="btn btn-raised btn-primary">{{category_subject.name}}</a>
+      {% endfor %}
+    </div>
+</div>
   <div class="col-md-12">
     <div class="panel panel-info">
       <div class="panel-heading headingOne">
@@ -157,7 +164,9 @@
 </div>
 
 <div class="panel-group ui-accordion ui-widget ui-helper-reset ui-sortable" id="accordion" role="tablist" aria-multiselectable="false">
-  <div><div class="panel panel-info">
+  <div>
+
+  <div class="panel panel-info">
 </div>
 
 
@@ -182,60 +191,105 @@
 </div>
 </div>
 <div>
-
-{% for subject in subjects %}
-<div class="panel panel-info">
-  <div class="panel-heading headingTwo ui-sortable-handle" role="tab">
-    <div class="row">
-        <div class="col-xs-9 col-md-10 titleTopic">
-          <a role="button" data-toggle="collapse" data-parent="#accordion" href=".collapseTwo" aria-expanded="true" aria-controls="collapseTwo">
-          <h4 style="color:white">{{subject.name}}</h4>
-          </a>
-        </div>
-        <div class="col-xs-3 col-md-2" id="divMoreActions">
-          <div class="btn-group">
-            <button class="btn btn-default btn-sm dropdown-toggle" type="button" id="moreActions" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-              <i class="fa fa-ellipsis-v fa-2x" aria-hidden="true"></i>
-            </button>
-            <ul class="dropdown-menu" aria-labelledby="moreActions">
-              <li><a href="javascript:void(0)" data-toggle="modal" data-target="#myModal3"><i class="fa fa-pencil fa-fw" aria-hidden="true"></i>&nbsp; Replicate</a></li>
-              <li><a href="javascript:void(0)" data-toggle="modal" data-target="#removeSubject2"><i class="fa fa-trash fa-fw" aria-hidden="true"></i>&nbsp; Remove</a></li>
-            </ul>
+    {% if request.GET.category == 'all' or none or request.GET.category == '' %}
+      {% for subject in subjects %}
+        <div class="panel panel-info">
+          <div class="panel-heading headingTwo ui-sortable-handle" role="tab">
+            <div class="row">
+                <div class="col-xs-9 col-md-10 titleTopic">
+                  <a role="button" data-toggle="collapse" data-parent="#accordion" href=".collapseTwo" aria-expanded="true" aria-controls="collapseTwo">
+                  <h4 style="color:white">{{subject.name}}</h4>
+                  </a>
+                </div>
+                <div class="col-xs-3 col-md-2" id="divMoreActions">
+                  <div class="btn-group">
+                    <button class="btn btn-default btn-sm dropdown-toggle" type="button" id="moreActions" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                      <i class="fa fa-ellipsis-v fa-2x" aria-hidden="true"></i>
+                    </button>
+                    <ul class="dropdown-menu" aria-labelledby="moreActions">
+                      <li><a href="javascript:void(0)" data-toggle="modal" data-target="#myModal3"><i class="fa fa-pencil fa-fw" aria-hidden="true"></i>&nbsp; Replicate</a></li>
+                      <li><a href="javascript:void(0)" data-toggle="modal" data-target="#removeSubject2"><i class="fa fa-trash fa-fw" aria-hidden="true"></i>&nbsp; Remove</a></li>
+                    </ul>
+                  </div>
+                </div>
+            </div>
           </div>
+          <div class="panel-body">
+              <p><b>{% trans "Professor" %}: </b>{% for professor in subject.professors.all %}{% if not forloop.first %},{% endif %}
+                {{professor}}{% if forloop.last %}.{% endif %}{% endfor %}</p>
+                <p>
+                  <b>{% trans "Description" %}: </b>
+                  <i>
+                    {{subject.description}}
+                  </i>
+                </p>
+                <div class="row">
+                  <div class="col-xs-6 col-md-6">
+                    <p><b>{% trans "Begining" %}: </b>{{subject.init_date}}</p>
+                  </div>
+                  <div class="col-xs-6 col-md-6">
+                    <p><b>{% trans "End" %}: </b>{{subject.end_date}}</p>
+                  </div>
+                </div>
+                <a href="{% url 'course:view_subject' subject.slug %}" class="btn btn-raised btn-default center-block">{% trans 'View Subject' %}<div class="ripple-container"></div></a>
+            </div>
         </div>
-    </div>
-  </div>
-  <div class="panel-body">
-      <p><b>{% trans "Professor" %}: </b>{% for professor in subject.professors.all %}{% if not forloop.first %},{% endif %}
-        {{professor}}{% if forloop.last %}.{% endif %}{% endfor %}</p>
-        <p>
-          <b>{% trans "Description" %}: </b>
-          <i>
-            {{subject.description}}
-          </i>
-        </p>
-        <div class="row">
-          <div class="col-xs-6 col-md-6">
-            <p><b>{% trans "Begining" %}: </b>{{subject.init_date}}</p>
-          </div>
-          <div class="col-xs-6 col-md-6">
-            <p><b>{% trans "End" %}: </b>{{subject.end_date}}</p>
+      {% endfor %}
+  {% else %}
+        {% for subject in subjects_category %}
+            {% if subject.category.name == request.GET.category %}
+              <div class="panel panel-info">
+          <div class="panel-heading headingTwo ui-sortable-handle" role="tab">
+            <div class="row">
+                <div class="col-xs-9 col-md-10 titleTopic">
+                  <a role="button" data-toggle="collapse" data-parent="#accordion" href=".collapseTwo" aria-expanded="true" aria-controls="collapseTwo">
+                  <h4 style="color:white">{{subject.name}}</h4>
+                  </a>
+                </div>
+                <div class="col-xs-3 col-md-2" id="divMoreActions">
+                  <div class="btn-group">
+                    <button class="btn btn-default btn-sm dropdown-toggle" type="button" id="moreActions" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                      <i class="fa fa-ellipsis-v fa-2x" aria-hidden="true"></i>
+                    </button>
+                    <ul class="dropdown-menu" aria-labelledby="moreActions">
+                      <li><a href="javascript:void(0)" data-toggle="modal" data-target="#myModal3"><i class="fa fa-pencil fa-fw" aria-hidden="true"></i>&nbsp; Replicate</a></li>
+                      <li><a href="javascript:void(0)" data-toggle="modal" data-target="#removeSubject2"><i class="fa fa-trash fa-fw" aria-hidden="true"></i>&nbsp; Remove</a></li>
+                    </ul>
+                  </div>
+                </div>
+            </div>
           </div>
+          <div class="panel-body">
+              <p><b>{% trans "Professor" %}: </b>{% for professor in subject.professors.all %}{% if not forloop.first %},{% endif %}
+                {{professor}}{% if forloop.last %}.{% endif %}{% endfor %}</p>
+                <p>
+                  <b>{% trans "Description" %}: </b>
+                  <i>
+                    {{subject.description}}
+                  </i>
+                </p>
+                <div class="row">
+                  <div class="col-xs-6 col-md-6">
+                    <p><b>{% trans "Begining" %}: </b>{{subject.init_date}}</p>
+                  </div>
+                  <div class="col-xs-6 col-md-6">
+                    <p><b>{% trans "End" %}: </b>{{subject.end_date}}</p>
+                  </div>
+                </div>
+                <a href="{% url 'course:view_subject' subject.slug %}" class="btn btn-raised btn-default center-block">{% trans 'View Subject' %}<div class="ripple-container"></div></a>
+            </div>
         </div>
-        <a href="{% url 'course:view_subject' subject.slug %}" class="btn btn-raised btn-default center-block">{% trans 'View Subject' %}<div class="ripple-container"></div></a>
-    </div>
-</div>
+            {% endif %}
+        {% endfor %}
+  {% endif %}
+
 {% if  user|has_role:'professor' or user|has_role:'system_admin' %}
   
     <div class="form-group">
-    <a href="{% url 'course:create_subject' subject.slug %}" data-toggle="modal" data-target="" class="btn btn-primary btn-lg btn-block btn-raised">{% trans 'Create Subject' %}<div class="ripple-container"></div></a>
+    <a href="#" data-toggle="modal" data-target="" class="btn btn-primary btn-lg btn-block btn-raised">{% trans 'Create Subject' %}<div class="ripple-container"></div></a>
   </div>
 {% endif %}
 
-
-{% endfor %}
-
-
 <!-- MODAL REMOVE -->
   <div class="modal" id="removeSubject2">
     <div class="modal-dialog">
diff --git a/courses/templates/subject/form_view_teacher.html b/courses/templates/subject/form_view_teacher.html
index f7e8ffd..dd61566 100644
--- a/courses/templates/subject/form_view_teacher.html
+++ b/courses/templates/subject/form_view_teacher.html
@@ -1,7 +1,8 @@
-    {% load static i18n list_topic_foruns permission_tags %}
+    {% load static i18n list_topic_foruns permission_tags widget_tweaks %}
 
     {% block javascript %}
         <script type="text/javascript" src="{% static 'js/forum.js' %}"></script>
+        <script type="text/javascript" src="{% static 'js/material.js' %}"></script>
     {% endblock %}
 
     <div class="panel-group accordion ui-accordion ui-widget ui-helper-reset ui-sortable" role="tablist" aria-multiselectable="false">
@@ -52,14 +53,17 @@
                     <a href="#" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-plus-circle fa-lg" aria-hidden="true"></i></a>
                     <ul class="dropdown-menu" aria-labelledby="dLabel">
                       <li><a href="javascript:void(0)" data-toggle="modal" data-target="#createLinksModal">Create a Link<div class="ripple-container"><div class="ripple ripple-on ripple-out" style="left: 54.5312px; top: 22px; background-color: rgb(0, 150, 136); transform: scale(20);"></div></div></a></li>
-                      <li><a href="javascript:void(0)" data-toggle="modal" data-target="#createFileModal">Create a file<div class="ripple-container"><div class="ripple ripple-on ripple-out" style="left: 33.5312px; top: 11px; background-color: rgb(0, 150, 136); transform: scale(20);"></div></div></a></li>
+                      <li><a href="javascript:createMaterial('{% url 'course:upload_material' %}', '{{ topic.id }}')">{% trans 'Create File' %}<div class="ripple-container"><div class="ripple ripple-on ripple-out" style="left: 33.5312px; top: 11px; background-color: rgb(0, 150, 136); transform: scale(20);"></div></div></a></li>
                     </ul>
                   </div>
                 </div>
                 <ul>
-                    <li><i class="fa fa-book" aria-hidden="true"></i> <a href="#">Book 1</a></li>
-                    <li><i class="fa fa-link" aria-hidden="true"></i>  <a href="#" data-toggle="modal" data-target="#linksModal">Link 1</a></li>
-                    <li><i class="fa fa-file-code-o" aria-hidden="true"></i> <a href="#" data-toggle="modal" data-target="#embedModal">EMBED Material</a></li>
+                    {% for file in files %}
+                      <li><i class="fa fa-book" aria-hidden="true"></i> <a href="{{file.file_url}}">{{file}}</a></li>
+                    {% endfor %}
+                    
+                   <!-- <li><i class="fa fa-link" aria-hidden="true"></i>  <a href="#" data-toggle="modal" data-target="#linksModal">Link 1</a></li>
+                    <li><i class="fa fa-file-code-o" aria-hidden="true"></i> <a href="#" data-toggle="modal" data-target="#embedModal">EMBED Material</a></li>-->
                 </ul>
               </div>
               <div class="col-xs-4 col-md-4">
@@ -70,7 +74,7 @@
                   <div class="dropdown">
                     <a href="#" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-plus-circle fa-lg" aria-hidden="true"></i></a>
                     <ul class="dropdown-menu" aria-labelledby="dLabel">
-                      <li><a href="javascript:createForum('{% url 'course:forum:create' %}', '{{ topic.id }}')">{% trans 'Create Forum' %}<div class="ripple-container"><div class="ripple ripple-on ripple-out" style="left: 33.5312px; top: 11px; background-color: rgb(0, 150, 136); transform: scale(20);"></div></div></a></li>
+                      <li><a href="javascript:createFforum('{% url 'course:forum:create' %}', '{{ topic.id }}')">{% trans 'Create Forum' %}<div class="ripple-container"><div class="ripple ripple-on ripple-out" style="left: 33.5312px; top: 11px; background-color: rgb(0, 150, 136); transform: scale(20);"></div></div></a></li>
                     </ul>
                   </div>
                 </div>
@@ -168,58 +172,23 @@
     </div>
     <!-- END -->
 
-    <!-- MODAL EDIT FILE -->
     <div class="modal fade" id="editFileModal" tabindex="-1" role="dialog" aria-labelledby="editFileLabel">
-    <div class="modal-dialog" role="document">
-    <div class="modal-content">
-      <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
-        <h4 class="modal-title" id="editFileLabel">Add File</h4>
-      </div>
-      <div class="modal-body">
-        <!-- Card -->
-
-                <form class="form-horizontal">
-                  <fieldset>
-
-                      <div class="form-group">
-                        <label for="inputName" class="col-md-2 control-label">Name</label>
-
-                        <div class="col-md-10">
-                          <input type="text" class="form-control" id="inputText" placeholder="Name" value="Book 1">
-                        </div>
-                      </div>
-
-                      <div class="form-group is-empty is-fileinput">
-                        <label for="inputFile" class="col-md-2 control-label">File</label>
-
-                        <div class="col-md-10">
-                          <input type="text" readonly="" class="form-control" placeholder="Browse...">
-                          <input type="file" id="inputFile" multiple="">
-                        </div>
-                      </div>
-
-
-                      <div class="form-group">
-                        <div class="col-md-12 text-center">
-                          <p><b>The file size shouldn't exceed 10MB</b></p>
-                        </div>
-                      </div>
-
-                      <div class="form-group">
-                        <div class="col-md-12">
-                          <a href="javascript:void(0)" class="btn btn-raised btn-default">Cancel</a>
-                          <a href="javascript:void(0)" class="btn btn-raised btn-primary">Submit</a>
-                        </div>
-                      </div>
-                    </fieldset>
-                  </form>
-
-
-            <!-- .end Card -->
-          </div>
+        <div class="modal-dialog" role="document">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
+                    <h4 class="modal-title" id="editFileLabel">{% trans 'Add File' %}</h4>
+                </div>
+                <div class="modal-body">
+                    <section>
+                        <div class="material_form"></div>
+                    </section>
+                </div>
+                <div class="modal-footer">
+                    <button type="button" onclick="$('#material_create').submit();" class="btn btn-primary btn-raised">{% trans 'Submit' %}</button>
+                </div>
+            </div>
         </div>
-      </div>
     </div>
 
 {% if user|has_role:'system_admin' or topic.owner == user%}
diff --git a/courses/urls.py b/courses/urls.py
index 018aa54..260f487 100644
--- a/courses/urls.py
+++ b/courses/urls.py
@@ -28,6 +28,7 @@ urlpatterns = [
 	url(r'^forum/', include('forum.urls', namespace = 'forum')),
 	url(r'^poll/', include('poll.urls', namespace = 'poll')),
 	url(r'^exam/', include('exam.urls', namespace = 'exam')),
+	url(r'^upload-material/$', views.UploadMaterialView.as_view(), name='upload_material'),
 
 
 
diff --git a/courses/views.py b/courses/views.py
index d406930..0b90819 100644
--- a/courses/views.py
+++ b/courses/views.py
@@ -13,10 +13,11 @@ from rolepermissions.verifications import has_object_permission
 from django.http import HttpResponseRedirect
 
 from .forms import CourseForm, UpdateCourseForm, CategoryCourseForm, SubjectForm,TopicForm,ActivityForm
-from .models import Course, Subject, CourseCategory,Topic, SubjectCategory,Activity
+from .models import Course, Subject, CourseCategory,Topic, SubjectCategory,Activity, CategorySubject
 from core.mixins import NotificationMixin
 from users.models import User
 from files.forms import FileForm
+from files.models import TopicFile
 
 from datetime import date
 
@@ -191,6 +192,23 @@ class CourseView(LoginRequiredMixin, NotificationMixin, generic.DetailView):
 			courses = self.request.user.courses.all()
 		elif has_role(self.request.user, 'student'):
 			courses = self.request.user.courses_student.all()
+
+		categorys_subjects = None
+		if has_role(self.request.user,'professor') or has_role(self.request.user,'system_admin'):
+			categorys_subjects = CategorySubject.objects.filter(subject_category__professors__name = self.request.user.name).distinct()
+		else:
+			categorys_subjects = CategorySubject.objects.filter(subject_category__students__name = self.request.user.name).distinct()
+		
+		subjects_category = Subject.objects.filter(category__name = self.request.GET.get('category'))
+		
+		none = None
+		q = self.request.GET.get('category', None)
+		if q is  None:
+			none = True
+		context['none'] = none
+		
+		context['subjects_category'] = subjects_category
+		context['categorys_subjects'] = categorys_subjects
 		context['courses'] = courses
 		context['title'] = course.name
 
@@ -300,14 +318,36 @@ class SubjectsView(LoginRequiredMixin, generic.ListView):
 		return context
 
 	def get_context_data(self, **kwargs):
-		subject = get_object_or_404(Subject, slug = self.kwargs.get('slug'))
+
 		context = super(SubjectsView, self).get_context_data(**kwargs)
+		subject = get_object_or_404(Subject, slug = self.kwargs.get('slug'))
 		context['course'] = subject.course
 		context['subject'] = subject
-		context['form_file'] = FileForm
 		context['topics'] = Topic.objects.filter(subject = subject)
+		if has_role(self.request.user,'professor') or has_role(self.request.user,'system_admin'):
+			context['files'] = TopicFile.objects.filter(professor__name = self.request.user.name)
+		else:
+			context['files'] = TopicFile.objects.filter(students__name = self.request.user.name)
+		return context
+		
+class UploadMaterialView(LoginRequiredMixin, generic.edit.CreateView):
+	login_url = reverse_lazy("core:home")	
+	redirect_field_name = 'next'
+
+	template_name = 'files/create_file.html'
+	form_class = FileForm
+	
+	def form_invalid(self, form):
+		context = super(UploadMaterialView, self).form_invalid(form)
+		context.status_code = 400
+
 		return context
 
+	def get_success_url(self):
+		self.success_url = reverse('course:view_subject', args = (self.object.slug, ))
+		
+		return self.success_url
+
 class TopicsView(LoginRequiredMixin, generic.ListView):
 
 	login_url = reverse_lazy("core:home")
diff --git a/exam/migrations/0001_initial.py b/exam/migrations/0001_initial.py
index 7ebe2b0..818e625 100644
--- a/exam/migrations/0001_initial.py
+++ b/exam/migrations/0001_initial.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.10 on 2016-10-06 19:57
+# Generated by Django 1.10 on 2016-10-17 15:49
 from __future__ import unicode_literals
 
 from django.db import migrations, models
@@ -11,6 +11,7 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
+        ('courses', '0001_initial'),
     ]
 
     operations = [
@@ -18,27 +19,26 @@ class Migration(migrations.Migration):
             name='Answer',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('answer', models.CharField(max_length=200, verbose_name='Answer')),
+                ('answer', models.CharField(max_length=300, verbose_name='Answer')),
                 ('order', models.PositiveSmallIntegerField(verbose_name='Order')),
             ],
             options={
-                'verbose_name_plural': 'Answers',
                 'ordering': ('order',),
+                'verbose_name_plural': 'Answers',
                 'verbose_name': 'Answer',
             },
         ),
         migrations.CreateModel(
             name='Exam',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(max_length=100, verbose_name='Name')),
-                ('beginDate', models.DateTimeField(auto_now_add=True, verbose_name='Start Date')),
-                ('endDate', models.DateTimeField(auto_now=True, verbose_name='Date of last update')),
+                ('activity_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='courses.Activity')),
+                ('begin_date', models.DateField(verbose_name='Begin of Course Date')),
             ],
             options={
                 'verbose_name_plural': 'Exams',
                 'verbose_name': 'Exam',
             },
+            bases=('courses.activity',),
         ),
         migrations.AddField(
             model_name='answer',
diff --git a/exam/migrations/0002_auto_20161013_2047.py b/exam/migrations/0002_auto_20161013_2047.py
deleted file mode 100644
index 2d3365f..0000000
--- a/exam/migrations/0002_auto_20161013_2047.py
+++ /dev/null
@@ -1,50 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.10 on 2016-10-13 23:47
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('courses', '0005_file'),
-        ('exam', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='exam',
-            name='beginDate',
-        ),
-        migrations.RemoveField(
-            model_name='exam',
-            name='endDate',
-        ),
-        migrations.RemoveField(
-            model_name='exam',
-            name='id',
-        ),
-        migrations.RemoveField(
-            model_name='exam',
-            name='name',
-        ),
-        migrations.AddField(
-            model_name='exam',
-            name='activity_ptr',
-            field=models.OneToOneField(auto_created=True, default=None, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='courses.Activity'),
-            preserve_default=False,
-        ),
-        migrations.AddField(
-            model_name='exam',
-            name='begin_date',
-            field=models.DateField(default=None, verbose_name='Begin of Course Date'),
-            preserve_default=False,
-        ),
-        migrations.AlterField(
-            model_name='answer',
-            name='answer',
-            field=models.CharField(max_length=300, verbose_name='Answer'),
-        ),
-    ]
diff --git a/files/admin.py b/files/admin.py
index 8c38f3f..683e681 100644
--- a/files/admin.py
+++ b/files/admin.py
@@ -1,3 +1,9 @@
 from django.contrib import admin
 
-# Register your models here.
+from .models import TopicFile
+
+class TopicFileAdmin(admin.ModelAdmin):
+	list_display = ['name', 'slug']
+	search_fields = ['name', 'slug']
+
+admin.site.register(TopicFile, TopicFileAdmin)
diff --git a/files/migrations/0001_initial.py b/files/migrations/0001_initial.py
index d0ae546..bc8de51 100644
--- a/files/migrations/0001_initial.py
+++ b/files/migrations/0001_initial.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.10 on 2016-10-13 16:12
+# Generated by Django 1.10 on 2016-10-17 15:49
 from __future__ import unicode_literals
 
 from django.db import migrations, models
@@ -12,8 +12,8 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
-        ('core', '0002_mymetype'),
-        ('courses', '0004_auto_20161011_1951'),
+        ('courses', '0001_initial'),
+        ('core', '0001_initial'),
     ]
 
     operations = [
@@ -26,8 +26,8 @@ class Migration(migrations.Migration):
                 ('file_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='topic_files', to='core.MymeType', verbose_name='Type file')),
             ],
             options={
-                'verbose_name': 'File',
                 'verbose_name_plural': 'Files',
+                'verbose_name': 'File',
             },
             bases=('courses.material',),
         ),
diff --git a/files/migrations/0002_topicfile_professor.py b/files/migrations/0002_topicfile_professor.py
new file mode 100644
index 0000000..f3efed4
--- /dev/null
+++ b/files/migrations/0002_topicfile_professor.py
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2016-10-17 15:49
+from __future__ import unicode_literals
+
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ('files', '0001_initial'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='topicfile',
+            name='professor',
+            field=models.ManyToManyField(related_name='file_professors', to=settings.AUTH_USER_MODEL, verbose_name='Professors'),
+        ),
+    ]
diff --git a/files/models.py b/files/models.py
index aad1439..020c632 100644
--- a/files/models.py
+++ b/files/models.py
@@ -2,6 +2,7 @@ from django.db import models
 from django.utils.translation import ugettext_lazy as _
 from core.models import MymeType
 from courses.models import Material
+from users.models import User
 
 """
 	Function to return the path where the file should be saved
@@ -15,6 +16,8 @@ def file_path(instance, filename):
 	It's like a support material for the students.
 """
 class TopicFile(Material):
+
+	professor = models.ManyToManyField(User,verbose_name=_('Professors'), related_name='file_professors')
 	description = models.TextField(_('Description'), blank=True)
 	file_url = models.FileField(verbose_name = _("File"), upload_to = file_path)
 	file_type = models.ForeignKey(MymeType, verbose_name=_('Type file'), related_name='topic_files')
diff --git a/files/templates/files/create_file.html b/files/templates/files/create_file.html
index 1185b6c..de4251f 100644
--- a/files/templates/files/create_file.html
+++ b/files/templates/files/create_file.html
@@ -1,83 +1,51 @@
-{% load widget_tweaks i18n %}
-<!-- MODAL CREATE FILE -->
-<div class="modal fade" id="createFileModal" tabindex="-1" role="dialog" aria-labelledby="createFileLabel" style="display: none;">
-    <div class="modal-dialog" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
-                <h4 class="modal-title" id="createFileLabel">{% trans 'Add File' %}</h4>
-            </div>
-            <div class="modal-body">
-            <!-- Card -->
-                <form class="form-horizontal">
-                {% csrf_token %}
-                    {% if messages %}
-                        {% for message in messages %}
-                            <div class="alert alert-{{ message.tags }} alert-dismissible" role="alert">
-                                <button type="button" class="close" data-dismiss="alert" aria-label="Close">
-                                    <span aria-hidden="true">&times;</span>
-                                </button>
-                                <p>{{ message }}</p>
-                            </div>
-                        {% endfor %}
-                    {% endif %}
-                    <fieldset>
-                        {% for field in form_file %}
-                            <div class="form-group is-empy{% if form.has_error %} has-error {% endif %} is-fileinput">
-                                <div class="col-md-12">
-                                    {% if field.field.required %}
-                                        <label for="{{ field.auto_id }}" class="control-label">{{ field.label }}<span>*</span></label>
-                                    {% else %}
-                                        <label for="{{ field.auto_id }}" class=" control-label">{{ field.label }}</label>
-                                    {% endif %}
-                                    {% if field.auto_id == 'id_file_url' %}
-                                        {% render_field field class='form-control input-sm' %}
-                                        <div class="input-group">
-                                            <input type="text" readonly="" class="form-control" placeholder="{% trans 'Choose your file...' %}">
-                                            <span class="input-group-btn input-group-sm">
-                                                <button type="button" class="btn btn-fab btn-fab-mini">
-                                                    <i class="material-icons">attach_file</i>
-                                                </button>
-                                            </span>
-                                        </div>
-                                    {% else %}
-                                        {% render_field field class='form-control input-sm' %}
-                                        <span id="helpBlock" class="help-block">{{ field.help_text }}</span>
-                                    {% endif %}
-                                </div>
-                                    
-                                {% if field.errors %}
-                                    <div class="alert alert-danger alert-dismissible" role="alert">
-                                        <button type="button" class="close" data-dismiss="alert" aria-label="Close">
-                                            <span aria-hidden="true">&times;</span>
-                                        </button>
-                                        <ul>
-                                            {% for error in field.errors %}
-                                                <li>{{ error }}</li>
-                                            {% endfor %}
-                                        </ul>
-                                    </div>
-                                {% endif %}
-                            </div>
-                        {% endfor %}
+{% load widget_tweaks i18n %} 
 
-                        <div class="form-group">
-                            <div class="col-md-12 text-center">
-                                <p><b>The file size shouldn't exceed 10MB</b></p>
-                            </div>
+<form method="post" id="material_create" enctype="multipart/form-data" action="{% if material %}{% else %}{% url 'course:upload_material' %}{% endif %}">
+    {% csrf_token %}
+    {% for field in form %}
+        <div class="form-group {% if form.has_error %} has-error {% endif %} is-fileinput">
+            {% if field.field.widget.input_type == 'hidden' %}
+                {% render_field field class='form-control' %}
+            {% else %}
+                {% if field.field.required %}
+                    <label for="{{ field.auto_id }}" class="control-label">{{ field.label }}<span>*</span></label>
+                {% else %}
+                    <label for="{{ field.auto_id }}" class=" control-label">{{ field.label }}</label>
+                {% endif %}
+                <label for="{{ field.auto_id }}">{{ field.label }}</label>
+                {% render_field field %}
+                <span class="help-block">{{ field.help_text }}</span>
+                {% if field.auto_id == 'id_file_url' %}
+                        {% render_field field class='form-control input-sm' %}
+                        <div class="input-group">
+                            <input type="text" readonly="" class="form-control" placeholder="{% trans 'Choose your file...' %}">
+                            <span class="input-group-btn input-group-sm">
+                                <button type="button" class="btn btn-fab btn-fab-mini">
+                                    <i class="material-icons">attach_file</i>
+                                </button>
+                            </span>
                         </div>
-
-                        <div class="form-group">
-                            <div class="col-md-12">
-                                <a href="javascript:void(0)" class="btn btn-raised btn-default">Cancel<div class="ripple-container"></div></a>
-                                <a href="javascript:void(0)" class="btn btn-raised btn-primary">Submit</a>
-                            </div>
+                    {% else %}
+                        {% render_field field class='form-control input-sm' %}
+                        <span id="helpBlock" class="help-block">{{ field.help_text }}</span>
+                    {% endif %}
+                {% if field.errors %}
+                    <div class="row">
+                        <br />
+                        <div class="alert alert-danger alert-dismissible" role="alert">
+                            <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+                                <span aria-hidden="true">&times;</span>
+                            </button>
+                            <ul>
+                                {% for error in field.errors %}
+                                    <li>{{ error }}</li>
+                                {% endfor %}
+                            </ul>
                         </div>
-                    </fieldset>
-                </form>
-            <!-- .end Card -->
-          </div>
+                    </div>
+                {% endif %}
+            {% endif %}
         </div>
-    </div>
-</div>
+    {% endfor %}
+</form>         
 <!-- EndModal -->
\ No newline at end of file
diff --git a/forum/migrations/0001_initial.py b/forum/migrations/0001_initial.py
index c8ce381..4ecdc80 100644
--- a/forum/migrations/0001_initial.py
+++ b/forum/migrations/0001_initial.py
@@ -1,8 +1,7 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.10 on 2016-10-05 13:38
+# Generated by Django 1.10 on 2016-10-17 15:49
 from __future__ import unicode_literals
 
-from django.conf import settings
 from django.db import migrations, models
 import django.db.models.deletion
 
@@ -13,7 +12,6 @@ class Migration(migrations.Migration):
 
     dependencies = [
         ('courses', '0001_initial'),
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
     ]
 
     operations = [
@@ -26,8 +24,8 @@ class Migration(migrations.Migration):
                 ('create_date', models.DateTimeField(auto_now_add=True, verbose_name='Create Date')),
             ],
             options={
-                'verbose_name': 'Forum',
                 'verbose_name_plural': 'Foruns',
+                'verbose_name': 'Forum',
             },
             bases=('courses.activity',),
         ),
@@ -38,12 +36,10 @@ class Migration(migrations.Migration):
                 ('message', models.TextField(verbose_name='Post message')),
                 ('modification_date', models.DateTimeField(auto_now=True, verbose_name='Modification Date')),
                 ('post_date', models.DateTimeField(auto_now_add=True, verbose_name='Post Date')),
-                ('forum', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='forum.Forum', verbose_name='Forum')),
-                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Autor')),
             ],
             options={
-                'verbose_name': 'Post',
                 'verbose_name_plural': 'Posts',
+                'verbose_name': 'Post',
             },
         ),
         migrations.CreateModel(
@@ -54,11 +50,10 @@ class Migration(migrations.Migration):
                 ('modification_date', models.DateTimeField(auto_now=True, verbose_name='Modification Date')),
                 ('answer_date', models.DateTimeField(auto_now_add=True, verbose_name='Answer Date')),
                 ('post', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='forum.Post', verbose_name='Post')),
-                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Autor')),
             ],
             options={
-                'verbose_name': 'Post Answer',
                 'verbose_name_plural': 'Post Answers',
+                'verbose_name': 'Post Answer',
             },
         ),
     ]
diff --git a/forum/migrations/0002_auto_20161017_1249.py b/forum/migrations/0002_auto_20161017_1249.py
new file mode 100644
index 0000000..be70482
--- /dev/null
+++ b/forum/migrations/0002_auto_20161017_1249.py
@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2016-10-17 15:49
+from __future__ import unicode_literals
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ('forum', '0001_initial'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='postanswer',
+            name='user',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Autor'),
+        ),
+        migrations.AddField(
+            model_name='post',
+            name='forum',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='forum.Forum', verbose_name='Forum'),
+        ),
+        migrations.AddField(
+            model_name='post',
+            name='user',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Autor'),
+        ),
+    ]
diff --git a/links/migrations/0001_initial.py b/links/migrations/0001_initial.py
index 9c60280..168e24b 100644
--- a/links/migrations/0001_initial.py
+++ b/links/migrations/0001_initial.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.10 on 2016-10-06 17:57
+# Generated by Django 1.10 on 2016-10-17 15:49
 from __future__ import unicode_literals
 
 from django.db import migrations, models
diff --git a/poll/migrations/0001_initial.py b/poll/migrations/0001_initial.py
index 413f0de..61d50bd 100644
--- a/poll/migrations/0001_initial.py
+++ b/poll/migrations/0001_initial.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.10 on 2016-10-05 13:38
+# Generated by Django 1.10 on 2016-10-17 15:49
 from __future__ import unicode_literals
 
 from django.db import migrations, models
@@ -23,9 +23,22 @@ class Migration(migrations.Migration):
                 ('order', models.PositiveSmallIntegerField(verbose_name='Order')),
             ],
             options={
-                'verbose_name': 'Answer',
-                'verbose_name_plural': 'Answers',
                 'ordering': ('order',),
+                'verbose_name_plural': 'Answers',
+                'verbose_name': 'Answer',
+            },
+        ),
+        migrations.CreateModel(
+            name='AnswersStudent',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('status', models.BooleanField(default=False, verbose_name='Answered')),
+                ('answered_in', models.DateTimeField(auto_now=True, verbose_name='Answered Date')),
+                ('answer', models.ManyToManyField(related_name='answers_stundet', to='poll.Answer', verbose_name='Answers Students')),
+            ],
+            options={
+                'verbose_name_plural': 'Answers Student',
+                'verbose_name': 'Answer Stundent',
             },
         ),
         migrations.CreateModel(
@@ -40,8 +53,8 @@ class Migration(migrations.Migration):
             bases=('courses.activity',),
         ),
         migrations.AddField(
-            model_name='answer',
+            model_name='answersstudent',
             name='poll',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='answers', to='poll.Poll', verbose_name='Answers'),
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='answers_stundet', to='poll.Poll', verbose_name='Poll'),
         ),
     ]
diff --git a/poll/migrations/0002_answersstudent.py b/poll/migrations/0002_answersstudent.py
deleted file mode 100644
index 031dd05..0000000
--- a/poll/migrations/0002_answersstudent.py
+++ /dev/null
@@ -1,33 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.10 on 2016-10-12 18:26
-from __future__ import unicode_literals
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ('poll', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='AnswersStudent',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('status', models.BooleanField(default=False, verbose_name='Answered')),
-                ('answered_in', models.DateTimeField(auto_now=True, verbose_name='Answered Date')),
-                ('answer', models.ManyToManyField(related_name='answers_stundet', to='poll.Answer', verbose_name='Answers Students')),
-                ('poll', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='answers_stundet', to='poll.Poll', verbose_name='Answers')),
-                ('student', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='answers_stundent', to=settings.AUTH_USER_MODEL, verbose_name='Student')),
-            ],
-            options={
-                'verbose_name': 'Answer Stundent',
-                'verbose_name_plural': 'Answers Student',
-            },
-        ),
-    ]
diff --git a/poll/migrations/0002_auto_20161017_1249.py b/poll/migrations/0002_auto_20161017_1249.py
new file mode 100644
index 0000000..735ffef
--- /dev/null
+++ b/poll/migrations/0002_auto_20161017_1249.py
@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2016-10-17 15:49
+from __future__ import unicode_literals
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ('poll', '0001_initial'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='answersstudent',
+            name='student',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='answers_stundent', to=settings.AUTH_USER_MODEL, verbose_name='Student'),
+        ),
+        migrations.AddField(
+            model_name='answer',
+            name='poll',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='answers', to='poll.Poll', verbose_name='Answers'),
+        ),
+    ]
diff --git a/poll/migrations/0003_auto_20161012_1638.py b/poll/migrations/0003_auto_20161012_1638.py
deleted file mode 100644
index 03d191d..0000000
--- a/poll/migrations/0003_auto_20161012_1638.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.10 on 2016-10-12 19:38
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('poll', '0002_answersstudent'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='answersstudent',
-            name='poll',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='answers_stundet', to='poll.Poll', verbose_name='Poll'),
-        ),
-    ]
diff --git a/users/migrations/0001_initial.py b/users/migrations/0001_initial.py
index 0e2632a..82b169d 100644
--- a/users/migrations/0001_initial.py
+++ b/users/migrations/0001_initial.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.10 on 2016-10-05 13:37
+# Generated by Django 1.10 on 2016-10-17 15:49
 from __future__ import unicode_literals
 
 import django.contrib.auth.models
@@ -42,8 +42,8 @@ class Migration(migrations.Migration):
                 ('user_permissions', models.ManyToManyField(blank=True, help_text='Specific permissions for this user.', related_name='user_set', related_query_name='user', to='auth.Permission', verbose_name='user permissions')),
             ],
             options={
-                'verbose_name': 'User',
                 'verbose_name_plural': 'Users',
+                'verbose_name': 'User',
             },
             managers=[
                 ('objects', django.contrib.auth.models.UserManager()),
--
libgit2 0.21.2