ChatChanges
Merge branch 'master' of https://github.com/gajayraghav/RPS

Conflicts:
	RPS1/AndroidManifest.xml
	RPS1/bin/AndroidManifest.xml
	RPS1/bin/classes.dex
	RPS1/bin/resources.ap_
	RPS1/res/layout/basic_chat.xml
	RPS1/res/values/strings.xml
	RPS1/src/com/netowrks/rps1/BasicChat.java
	RPS1/src/com/netowrks/rps1/LlPacket.java
	RPS1/src/com/netowrks/rps1/LowerLayer.java
merge