DATE
Problem with Client.apk DATE2
Merge remote-tracking branch 'origin/master'

Conflicts:
	Client/src/es/ucm/tfg/controlremotolinux/client/DragAndDropView.java