Ultimo commit
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/classes/mete_service/model/Cliente.class
	Meeting_Service/bin/classes/mete_service/model/Usuario.class
	Meeting_Service/bin/classes/mete_service/model/repositorio/RepositorioCliente.class
	Meeting_Service/src/mete_service/model/Cliente.java
	Meeting_Service/src/mete_service/model/Usuario.java
	Meeting_Service/src/mete_service/model/repositorio/RepositorioCliente.java
commit