Merge pull request #17 from cltlfcjin/master

merge
remove colletor port from message proto
Merge pull request #18 from ErikFang/master

remove colletor port from message proto
remove message RecoveryCollector.proto
Merge pull request #19 from ErikFang/master

remove message RecoveryCollector.proto
Merge pull request #8 from dianping/master

from dianping to jin