Merge branch 'dev' into test

coco/app.py

@@ -49,7 +49,7 @@ class Coco:
         'MAX_CONNECTIONS': 500,
         'ADMINS': '',
         'COMMAND_STORAGE': {'TYPE': 'server'},   # server
-        'REPLAY_RECORD_ENGINE': 'server',
+        'REPLAY_STORAGE': {'TYPE': 'server'},
     }
 
     def __init__(self, root_path=None):

coco/recorder.py

@@ -271,7 +271,5 @@ def get_replay_recorder_class(config):
     replay_storage = config["REPLAY_STORAGE"]
     if replay_storage['TYPE'] == "s3":
         return S3ReplayRecorder
-    elif replay_storage['TYPE'] == "locale":
-        return ServerReplayRecorder
     else:
         return ServerReplayRecorder

conf_example.py

@@ -62,6 +62,9 @@ class Config:
     COMMAND_STORAGE = {
         "TYPE": "server"
     }
+    REPLAY_STORAGE = {
+        "TYPE": "server"
+    }
 
 
 config = Config()