trabajando con Amigos.java
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_
registro ok, login putextra
Merge remote-tracking branch 'origin/Aitor'

Conflicts:
	CaptureActivity/bin/captureactivity.jar
	DondeEstanMisAmigos/bin/R.txt
	DondeEstanMisAmigos/bin/classes/.gitignore
	DondeEstanMisAmigos/bin/jarlist.cache
	DondeEstanMisAmigos/gen/.gitignore
	DondeEstanMisAmigos/res/layout/invitar.xml
	DondeEstanMisAmigos/res/values/strings.xml