Merge branch 'master' into 'fixes2'

# Conflicts:
#   test_api/apitest/runner.py

test_api/apitest/runner.py

@@ -28,11 +28,11 @@ import websocket
 
 from websocket import create_connection
 from test_api.apitest.constants import BookNames
-
 from test_api.apitest.logger import print_text, print_error, print_ok, print_info
 # from test_api.apitest.logger import print_debug
 
 
+
 class RunTestsController(object):
 
     def __init__(self, address, http_port: str, ws_port: str):
@@ -62,7 +62,11 @@ class RunTestsController(object):
             print_error("Could not connect to WS! Exiting.")
 
     def on_message(self, message: str) -> None:
+<<<<<<< test_api/apitest/runner.py
         # print_debug("Message returned")
+=======
+        print_info("Message returned")
+>>>>>>> test_api/apitest/runner.py
         self.result_stage = message
         self.compare_stage()
         self.received = True

test_api/runner.py

@@ -29,7 +29,7 @@ def start() -> None:
     Instantiate and run the tests.
     :return:
     """
-    print_text('OpenLP - API Test Runner V0_1')
+    print_text('OpenLP - API Test Runner V0_2')
     print_text('Check OpenLP is running')
     op_address, op_http_port = check_for_openlp('http')
     if not op_http_port: