Eventos 1
eventos 2
Eventos 3
Merge remote-tracking branch 'origin/Safe'

Conflicts:
	.classpath
	bin/MainActivity.apk
	bin/classes.dex
	bin/classes/org/sca/sca/R$layout.class
	bin/classes/org/sca/sca/R$menu.class
	bin/classes/org/sca/sca/R$string.class
	bin/classes/org/sca/sca/R$style.class
	bin/dexedLibs/android-support-v4-c7122b930ca8b716dc99dcb983d05584.jar
	bin/resources.ap_
	gen/org/sca/sca/R.java