show images
Merge branch 'master' of https://github.com/Duttenheim/M7016E

Conflicts:
	TEST-ZONE/WEB/app.js
	code/src/bitverse/edge_node.go
	code/src/github.com/fsouza/go-dockerclient