12
Merge remote-tracking branch 'origin/master'

Conflicts:
	AndroidManifest.xml
	bin/AppSocket.apk
	bin/classes.dex
	bin/resources.ap_
	src/com/example/appsocket_01/MainActivity.java