Merge branch 'v2-dev' of https://github.com/allianceauth/allianceauth into sso_registration

Conflicts:
	alliance_auth/settings.py.example
	test_allianceauth/settings.py

allianceauth/services/modules/phpbb3/tests.py

@@ -123,14 +123,13 @@ class Phpbb3HooksTestCase(TestCase):
 class Phpbb3ViewsTestCase(TestCase):
     def setUp(self):
         self.member = AuthUtils.create_member('auth_member')
-        self.member.set_password('password')
         self.member.email = 'auth_member@example.com'
         self.member.save()
         AuthUtils.add_main_character(self.member, 'auth_member', '12345', corp_id='111', corp_name='Test Corporation')
         add_permissions()
 
     def login(self):
-        self.client.login(username=self.member.username, password='password')
+        self.client.force_login(self.member)
 
     @mock.patch(MODULE_PATH + '.tasks.Phpbb3Manager')
     @mock.patch(MODULE_PATH + '.views.Phpbb3Manager')

allianceauth/services/modules/phpbb3/urls.py

@@ -2,6 +2,8 @@ from django.conf.urls import url, include
 
 from . import views
 
+app_name = 'phpbb3'
+
 module_urls = [
     # Forum Service Control
     url(r'^activate/$', views.activate_forum, name='activate'),
@@ -11,5 +13,5 @@ module_urls = [
 ]
 
 urlpatterns = [
-    url(r'^phpbb3/', include(module_urls, namespace='phpbb3'))
+    url(r'^phpbb3/', include((module_urls, app_name), namespace=app_name))
 ]