Merge 0.2.17 release into develop

helpdesk/urls.py

@@ -14,7 +14,7 @@ from django.views.generic import TemplateView
 
 from helpdesk.decorators import helpdesk_staff_member_required, protect_view
 from helpdesk import settings as helpdesk_settings
-from helpdesk.views import feeds, staff, public, kb
+from helpdesk.views import feeds, staff, public, kb, login
 try:
     import helpdesk.tasks
 except ImportError:
@@ -194,8 +194,7 @@ urlpatterns += [
 
 urlpatterns += [
     url(r'^login/$',
-        auth_views.LoginView.as_view(
-            template_name='helpdesk/registration/login.html'),
+        login.login,
         name='login'),
 
     url(r'^logout/$',