Merge remote-tracking branch 'origin/dev' into feature/915_PRI-31_Packaging_Deployment

# Conflicts:
#	tests/conftest.py
#	tests/test_observation_space.py
#	tests/test_reward.py

tests/conftest.py

@@ -61,7 +61,8 @@ def run_generic(env, config_values):
             # Send the observation space to the agent to get an action
             # TEMP - random action for now
             # action = env.blue_agent_action(obs)
-            action = env.action_space.sample()
+            # action = env.action_space.sample()
+            action = 0
 
             # Run the simulation step on the live environment
             obs, reward, done, info = env.step(action)