Merge branch 'master' of ssh://86.30.118.83/home/pi/teasafe into guidev
Fleshing out GUI container creation
Merge branch 'guidev' of ssh://localhost/home/pi/teasafe into guidev