Todas as Activitys
Merge remote-tracking branch 'origin/master'

Conflicts:
	TrabEtapa1/res/values/strings.xml