DATE
Merge branch 'master' of
https://github.com/ocrespo/TFG-Linux-control-remoto.git

Conflicts:
	Client/libs/armeabi/gdb.setup
CLIENTE, Porfin carga las librerias y se ejcuta libvncclient con
libturbojpeg y GNUtls 3.0.26