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

Conflicts:
	Meeting_Service/AndroidManifest.xml
	Meeting_Service/bin/AndroidManifest.xml
	Meeting_Service/bin/Mete_Service.apk
	Meeting_Service/bin/classes.dex
	Meeting_Service/bin/classes/br/uni/mete_service/Controller/HomeActivity.class
	Meeting_Service/bin/classes/br/uni/mete_service/Controller/LoginActivity.class
	Meeting_Service/bin/classes/br/uni/mete_service/model/AcompanhanteAdapter.class
	Meeting_Service/bin/classes/br/uni/mete_service/model/repositorio/Cliente/ClienteParser.class
	Meeting_Service/bin/classes/br/uni/mete_service/model/repositorio/ClienteController.class
	Meeting_Service/bin/resources.ap_
	Meeting_Service/src/br/uni/mete_service/model/AcompanhanteAdapter.java