Regardless of whether she's "just" being friendly / unaware / overly "touchy feely" (which is still inappropriate in a work setting) or she's harassing you, you are understandably uncomfortable with her touching you and making comments. That's what matters. Her behavior towards you won't stop unless you say something and I'm So sorry she's doing this. She's being completely inappropriate.

I get the sense from reading what you've posted that you don't want to "make a big deal of this" or speak up. Is that accurate? My apologies if I sensed that wrong. I do hope you talk to HR.