Merge branch 'master' into test

Ansjer/test_settings.py

@@ -110,8 +110,8 @@ AUTH_PASSWORD_VALIDATORS = [
 ]
 
 LANGUAGE_CODE = 'en-us'
-TIME_ZONE = 'Asia/Shanghai'
-# TIME_ZONE = 'UTC'
+# TIME_ZONE = 'Asia/Shanghai'
+TIME_ZONE = 'UTC'
 USE_I18N = True
 USE_L10N = True
 USE_TZ = True