updating
Merge branch 'master' of github.com:jheise/docker-dashboard

Conflicts:
	src/dashboard.py
solved config issue