adding delete call
Merge branch 'master' of https://github.com/jswxwxf/p2p.git

Conflicts:
	TestInApp/src/main/java/com/hp/inapp/controller/InAppController.java
	TestSubscription/src/main/java/com/hp/subscription/controller/SubscriptionController.java
	p2pin/src/main/java/com/hp/p2p/in/controller/P2PInController.java
	p2pout/src/main/java/com/hp/p2p/out/controller/P2POutController.java