Merge branch 'top-video' into pre-master

config.py

@@ -179,6 +179,6 @@ class ProductionConfig(BaseConfig):
 
 def set_config():
     # return DevelopmentConfig()
-    return TestConfig()
-    # return PreProductionConfig()
+    # return TestConfig()
+    return PreProductionConfig()
     # return ProductionConfig()