Nao ligues so para estar actual
Merge remote-tracking branch 'origin/master'

Conflicts:
	TrabEtapa1/src/com/grupo5/trabetapa1/activities/PreferencesActivity.java
	TrabEtapa1/src/com/grupo5/trabetapa1/main/YambApplication.java