second commit
Merge branch 'master' of https://github.com/MrVANO/Navigator.git

Conflicts:
	WiFiNavigator/src/com/navigator/sockets/MyClientSocket.java