merge
Merge branch 'master' of https://github.com/pedropvf/SETEC.git

Conflicts:
	UserInterface/bin/UserInterface.apk
	UserInterface/bin/classes.dex
	UserInterface/bin/classes/setec/g3/maincontroller/Login.class
	UserInterface/bin/resources.ap_

	Funciona o Login. Mudei coisas na NetThread e na ReadNet. Also, no
Login.
Mudei muitas classes... não vale a pena especificar...
Merge branch 'master' of https://github.com/pedropvf/SETEC.git

Conflicts:
	UserInterface/bin/UserInterface.apk
	UserInterface/bin/classes.dex
	UserInterface/bin/classes/setec/g3/communication/ReadNet.class
	UserInterface/bin/classes/setec/g3/gps/GPSTracker.class
	UserInterface/bin/classes/setec/g3/maincontroller/MainUI$10.class
	UserInterface/bin/classes/setec/g3/maincontroller/MainUI$11.class
	UserInterface/bin/resources.ap_