teste
Merge branch 'master' of
https://github.com/lucasmichel/mete_service_android.git

Conflicts:
	Meeting_Service/bin/Mete_Service.apk
	Meeting_Service/bin/classes.dex
	Meeting_Service/bin/classes/br/uni/mete_service/Controller/EscolhaDoUsuarioActivity.class
	Meeting_Service/bin/classes/br/uni/mete_service/R$string.class
	Meeting_Service/bin/classes/br/uni/mete_service/R$style.class
	Meeting_Service/bin/resources.ap_