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

Conflicts:
	Mette_Service_2.3/bin/Mette_Service_2.3.apk
	Mette_Service_2.3/bin/classes.dex
	Mette_Service_2.3/bin/classes/br/uni/mette_service/Controller/Acompanhante/FotoAcompanhanteActivity.class
	Mette_Service_2.3/bin/dexedLibs/google-play-services_lib-b227ffe568148ca6bb6dc45835032ae6.jar
	Mette_Service_2.3/bin/resources.ap_