Correção commit Marcos
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/classes/com/example/alphanet/voosActivity$1.class
	bin/classes/com/example/alphanet/voosActivity.class
	src/com/example/alphanet/voosActivity.java