Forzado

forzado
?

?
Merge remote-tracking branch 'origin/Aitor'

Conflicts:
	CaptureActivity/bin/captureactivity.jar
Merge branch 'master' into Aitor