Merge branch 'master' into test

# Conflicts:
#	Ansjer/urls.py

Ansjer/local_settings.py

@@ -78,10 +78,10 @@ SERVER_HOST = '192.168.136.45'
 DATABASES_USER = 'ansjer'
 DATABASES_PASS = 'ansjer.x.x'
 
-DATABASE_DATA = 'AnsjerLocal'
-SERVER_HOST = 'localhost'
-DATABASES_USER = 'root'
-DATABASES_PASS = '123456'
+# DATABASE_DATA = 'AnsjerLocal'
+# SERVER_HOST = 'localhost'
+# DATABASES_USER = 'root'
+# DATABASES_PASS = '123456'
 
 DATABASES = {'default': {
     'ENGINE': 'django.db.backends.mysql',

Ansjer/urls.py

@@ -202,8 +202,4 @@ urlpatterns = [
     # url(r'^(?P<path>.*)/(?P<UID>.*)/lls$', Test.Test.as_view(), name=u'gg'),
     #testing....................
     re_path('(?P<path>.*)', LogManager.errorPath),
-    # test
-
-
-
 ]