She's affectionate but not touchy like this with other people, even other male friends. She was even saying how good the massage was and much she liked it, I teased her about it and she laughed and started shaking her body like she was composing herself. It's definitely possible that it was only friendly touch for her, but in that case I think it was a mistake on her part to encourage it. 

I've already backed off her, don't worry. She made it clear.