Registro petando al lanzar activity
Merge branch 'master' into Aitor

Conflicts:
	CaptureActivity/bin/captureactivity.jar
	DondeEstanMisAmigos/bin/DondeEstanMisAmigos.apk
	DondeEstanMisAmigos/bin/classes.dex

DondeEstanMisAmigos/bin/classes/com/example/dondeestanmisamigos/Login$Pl
aceholderFragment.class

DondeEstanMisAmigos/bin/classes/com/example/dondeestanmisamigos/Login.cl
ass
	DondeEstanMisAmigos/bin/resources.ap_