fixed daemon/manager
Merge branch 'master' of github.com:bpospichil/gerredes
added channel table