nada especial
Merge branch 'master' into Aitor

Conflicts:
	CaptureActivity/bin/captureactivity.jar
añadidos permisos, activities en manifest y string
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