diff --git a/amadeus/settings.py b/amadeus/settings.py
index 481955f..afa7494 100644
--- a/amadeus/settings.py
+++ b/amadeus/settings.py
@@ -56,6 +56,7 @@ INSTALLED_APPS = [
     'forum',
     'poll',
     'links',
+    'exam',
 
 ]
 
diff --git a/exam/models.py b/exam/models.py
index 79f88a6..e77c2c0 100644
--- a/exam/models.py
+++ b/exam/models.py
@@ -1,22 +1,27 @@
+from django.utils.translation import ugettext_lazy as _
 from django.db import models
+from autoslug.fields import AutoSlugField
+from users.models import User
+from core.models import Resource
+
 
 class Exam(models.Model):
 	name = models.CharField(_('Name'), max_length = 100)
 	beginDate = models.DateTimeField(_('Start Date'), auto_now_add = True)
 	endDate = models.DateTimeField(_('Date of last update'), auto_now=True)
 
-    class Meta:
-
-        verbose_name = _('Exam')
-        verbose_name_plural = _('Exams')
+	class Meta:
+		#ordering = ('create_date','name')
+		verbose_name = _('Exam')
+		verbose_name_plural = _('Exams')
 
-    def __str__(self):
-        return str(self.name) + str("/") + str(self.topic)
+		def __str__(self):
+			return str(self.name) + str("/") + str(self.topic)
 
 class Answer(models.Model):
     answer = models.CharField(_("Answer"), max_length = 200)
     order = models.PositiveSmallIntegerField(_("Order"))
-    exam = models.ForeignKey(Poll, verbose_name = _('Answers'), related_name='answers')
+    exam = models.ForeignKey(Exam, verbose_name = _('Answers'), related_name='answers')
 
     class Meta:
         ordering = ('order',)
--
libgit2 0.21.2