update MainActivity
Merge branch 'master' of https://github.com/edrinkercope/TCPClient

Conflicts:
	bin/TCPClient.apk
	bin/classes/com/example/tcpclient/MainActivity.class
	bin/resources.ap_
merge marc's new features
add screen lock feature
Add UDP broadcast and device list to connections tab
merge
merge
Get udp broadcast and tcp connection working
Get udp broadcast and tcp connection working