Merge branch 'oscar'
Agregado PuntoAtencion

Agregado factory punto atencion, y editado otras cosas
Merge remote-tracking branch 'origin/master' into felipe
Merge branch 'oscar'
Merge branch 'master' into oscar