neue logging version
Merge branch 'master' of github.com:ctldev/ctlweb

Conflicts:
	bin/ctl-web