Add socket to send the wifi info to server
Merge branch 'socket' of github.com:daqiuqu/wifi_signal into socket

Conflicts:
	.idea/workspace.xml
	out/production/wifi_signal/com/example/wifi_signal/MyActivity$1.class
	out/production/wifi_signal/com/example/wifi_signal/MyActivity.class
	src/com/example/wifi_signal/MyActivity.java
	src/com/example/wifi_signal/client.java