Push 401
Merge remote-tracking branch 'origin/Aitor'

Conflicts:
	CaptureActivity/bin/captureactivity.jar