apk modified.
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	AccesoWebService/bin/AccesoWebService.apk