change registerDelivery
Merge branch 'master' of https://github.com/shengluLancer/cap

Conflicts:
	src/com/sears/SYWL/p2p/api/P2PAPI.java
	src/com/sears/SYWL/p2p/api/P2PAPIImpl.java