Merge branch 'master' into mat_dev2

# Conflicts:
#	test_api.sh

test_api.sh

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+docker images
+docker ps -a
+curl http://localhost:8888/version