Client: comprobando IP, y retoques. Date.
Merge branch 'master' of
http://github.com/ocrespo/TFG-Linux-control-remoto.git

Conflicts:
	Client/res/values-es/strings.xml