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

Conflicts:
	Meeting_Service/bin/classes/br/uni/mete_service/Controller/CadastroClienteActivity.class
	Meeting_Service/bin/classes/br/uni/mete_service/Controller/ClienteController.class
	Meeting_Service/bin/classes/br/uni/mete_service/Controller/ClienteParser.class
	Meeting_Service/bin/classes/br/uni/mete_service/Controller/ListarAcompanhanteActivity$AcompanhanteAsyncTask.class
	Meeting_Service/bin/classes/br/uni/mete_service/Controller/LoginActivity.class
	Meeting_Service/bin/classes/br/uni/mete_service/Controller/PreferencesController.class