add pkg
support one byte heartbeat
Merge remote branch 'upstream/master'

Conflicts:
	pushapi/pushapi.go
update