diff --git a/amadeus/settings.py b/amadeus/settings.py
index d0de5a3..f4afff2 100644
--- a/amadeus/settings.py
+++ b/amadeus/settings.py
@@ -54,6 +54,7 @@ INSTALLED_APPS = [
     'users',
     'forum',
     'poll',
+    'avaliacao',
     's3direct',
 ]
 
diff --git a/avaliacao/__init__.py b/avaliacao/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/avaliacao/__init__.py
diff --git a/avaliacao/admin.py b/avaliacao/admin.py
new file mode 100644
index 0000000..8c38f3f
--- /dev/null
+++ b/avaliacao/admin.py
@@ -0,0 +1,3 @@
+from django.contrib import admin
+
+# Register your models here.
diff --git a/avaliacao/apps.py b/avaliacao/apps.py
new file mode 100644
index 0000000..bd8d7f1
--- /dev/null
+++ b/avaliacao/apps.py
@@ -0,0 +1,5 @@
+from django.apps import AppConfig
+
+
+class AvaliacaoConfig(AppConfig):
+    name = 'avaliacao'
diff --git a/avaliacao/migrations/__init__.py b/avaliacao/migrations/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/avaliacao/migrations/__init__.py
diff --git a/avaliacao/models.py b/avaliacao/models.py
new file mode 100644
index 0000000..8a0cc42
--- /dev/null
+++ b/avaliacao/models.py
@@ -0,0 +1,20 @@
+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
+from courses.models import Activity
+
+class Avaliacao(Activity):
+
+    name_avalicao = models.CharField(_('Name'), max_length = 100)
+    init_date = models.DateField(_('Begin of Avaliacao Date'))
+    end_date = models.DateField(_('End of Avaliacao Date'))
+
+    class Meta:
+        #ordering = ('create_date','name')
+        verbose_name = _('Avaliacao')
+        verbose_name_plural = _('Avaliacoes')
+
+def __str__(self):
+    return str(self.name) + str("/") + str(self.topic)
diff --git a/avaliacao/tests.py b/avaliacao/tests.py
new file mode 100644
index 0000000..7ce503c
--- /dev/null
+++ b/avaliacao/tests.py
@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.
diff --git a/avaliacao/urls.py b/avaliacao/urls.py
new file mode 100644
index 0000000..4ac923c
--- /dev/null
+++ b/avaliacao/urls.py
@@ -0,0 +1,7 @@
+from django.conf.urls import url
+
+from . import views
+
+urlpatterns =[
+
+]
diff --git a/avaliacao/views.py b/avaliacao/views.py
new file mode 100644
index 0000000..91ea44a
--- /dev/null
+++ b/avaliacao/views.py
@@ -0,0 +1,3 @@
+from django.shortcuts import render
+
+# Create your views here.
diff --git a/core/urls.py b/core/urls.py
index fc240cb..c3c530e 100644
--- a/core/urls.py
+++ b/core/urls.py
@@ -1,7 +1,6 @@
 from django.conf.urls import url, include
 from django.contrib.auth import views as auth_views
 from django.contrib.auth.views import password_reset, password_reset_done,password_reset_confirm, password_reset_complete
-
 from . import views
 
 
@@ -12,10 +11,13 @@ urlpatterns = [
     url(r'^logout/$', auth_views.logout, {'next_page': 'core:home'}, name='logout'),
     url(r'^notification/([0-9]+)/$', views.processNotification, name='notification_read'),
     url(r'^getNotifications/$', views.getNotifications, name='getNotifications'),
+]
 
-	url(r'^reset/$', password_reset, {'template_name':'registration/passwor_reset_form.html','email_template_name':'registration/password_reset_email.html','post_reset_redirect':'done/'}, name="password_reset"),
-	url(r'^reset/done/$', password_reset_done, {'template_name':'registration/passwor_reset_done.html'}),
-	url(r'^reset/(?P<uidb36>[0-9A-Za-z]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})/$', password_reset_confirm, {'template_name':'registration/password_reset_confirm.html'}),
-	url(r'^done/$', password_reset_complete,{'template_name':'registration/passwor_reset_complete.html'}),
+#Reset Password
+urlpatterns += [
+	url(r'^password/reset/$', password_reset, {'post_reset_redirect' : 'password/reset/done/','template_name': 'registration/passwor_reset_form.html'}, name="password_reset"),
+	url(r'^password/reset/done/$', password_reset_done, {'template_name': 'registration/passwor_reset_done.html'}),
+	url(r'^password/reset/(?P<uidb36>[0-9A-Za-z]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})/$', password_reset_confirm, {'post_reset_redirect' : 'password/done/', 'template_name': 'registration/password_reset_confirm.html'}),
+	url(r'^password/done/$', password_reset_complete,{'template_name': 'registration/passwor_reset_complete.html'}),
 
 ]
diff --git a/courses/urls.py b/courses/urls.py
index a6c6e2a..57c6679 100644
--- a/courses/urls.py
+++ b/courses/urls.py
@@ -25,6 +25,6 @@ urlpatterns = [
 
 
 	url(r'^forum/', include('forum.urls', namespace = 'forum')),
-	url(r'^poll/', include('poll.urls', namespace = 'poll'))
-
+	url(r'^poll/', include('poll.urls', namespace = 'poll')),
+	url(r'^avaliacao/', include('avaliacao.urls', namespace = 'avaliacao'))
 ]
diff --git a/manage.py b/manage.py
old mode 100755
new mode 100644
index 1027e9d..1027e9d
--- a/manage.py
+++ b/manage.py
--
libgit2 0.21.2