add edge to HTPCManager
Merge branch 'master' of https://github.com/smdion/docker-containers

Conflicts:
	htpcmanager/Dockerfile