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

Conflicts:
	Meeting_Service/bin/classes/br/uni/mete_service/Controller/Acompanhante/CadastroAcompanhanteActivity.class
	Meeting_Service/bin/classes/br/uni/mete_service/Controller/Acompanhante/DadosAcompanhanteActivity.class
	Meeting_Service/bin/classes/br/uni/mete_service/Controller/Acompanhante/ListarAcompanhanteActivity$MeninasAsyncTask.class
	Meeting_Service/bin/classes/br/uni/mete_service/Controller/Cliente/CadastroClienteActivity.class
	Meeting_Service/bin/classes/br/uni/mete_service/Controller/LoginActivity.class
	Meeting_Service/bin/classes/br/uni/mete_service/model/repositorio/Acompanhante/AcompanhanteAdapter.class
	Meeting_Service/bin/classes/br/uni/mete_service/model/repositorio/Acompanhante/AcompanhanteController.class
	Meeting_Service/bin/classes/br/uni/mete_service/model/repositorio/Cliente/ClienteController.class
	Meeting_Service/bin/classes/br/uni/mete_service/model/repositorio/Cliente/RepositorioCliente.class
	Meeting_Service/bin/classes/br/uni/mete_service/model/repositorio/RepositorioClass.class