test timeout
use github.com/ugorji/go/codec
Merge branch 'master' into sender-listener

Conflicts:
	user.go
don't log error twice
go fmt