Acho que isto é suposto resolver os conflitos
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$1.class
	UserInterface/bin/classes/setec/g3/maincontroller/Login$2.class
	UserInterface/bin/classes/setec/g3/maincontroller/Login$3.class
	UserInterface/bin/classes/setec/g3/maincontroller/Login.class
	UserInterface/bin/resources.ap_
	UserInterface/res/drawable/gps_indicator_off.png
	UserInterface/res/drawable/gps_indicator_on.png
	UserInterface/res/drawable/text_to_speech_enabler_off.png
	UserInterface/res/drawable/text_to_speech_enabler_on.png
	UserInterface/res/raw/dead_man_alert_1.mp3
	UserInterface/res/raw/dead_man_alert_2.mp3
	UserInterface/res/raw/dead_man_alert_3.mp3
	UserInterface/src/setec/g3/tapp/TapDetectorEnums.java
	UserInterface/src/setec/g3/tapp/TappDetector.java