TESTE
Classes Usuario e Cliente
Merge branch 'master' of
https://github.com/lucasmichel/mete_service_android.git

Conflicts:
	Meeting_Service/bin/classes/com/example/meeting_service/R$id.class
	Meeting_Service/bin/classes/com/example/meeting_service/R$layout.class
	Meeting_Service/bin/classes/com/example/meeting_service/R$menu.class
	Meeting_Service/bin/classes/com/example/meeting_service/R$string.class
	Meeting_Service/bin/classes/com/example/meeting_service/R$style.class
	Meeting_Service/bin/classes/mete_service/model/ListarAcompanhanteActivity.class
	Meeting_Service/gen/com/example/meeting_service/R.java
	Meeting_Service/src/mete_service/exception/Acomp_Adapter.java