One problem fixed

fixing the problem of asynchronization between client and server
Merge branch 'master' of https://github.com/Acen1991/bluetoothTest

Conflicts:
	src/com/example/bluetoothtest/ConnectedThread.java
	src/com/example/bluetoothtest/MainActivity.java