mergiando com ramo master;
Merge branch 'master' of https://github.com/leonardodamata/SeVira.git

Conflicts:
	bin/classes/br/com/especializacao/sevira/MainActivity.class