tou a tentar ir buscar a versao do Pedro
Merge branch 'master' of https://github.com/pedropvf/SETEC.git

Conflicts:
	UserInterface/bin/UserInterface.apk
	UserInterface/bin/classes.dex
	UserInterface/bin/resources.ap_

	also, woking in the login