ultimo merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/res/layout/k_registrar_supervision_recoleccion.xml
sppiners llenos y listos para cambiar
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/co/qualitysolutions/supervision/L_ubicacion.java
Supervision 100% integrada con servidor php