actually i agree with ur view rather than ur fren's view. cos most of my guy's fren do that to me. always poke me, playing with my hair and also telling me their problems. i think that is really normal. i even have a guy fren will always help me, call me n tell me his problems (which is very private like family problems), have meals together, always ask me to kiss him or even give him a hug after each time he help me. we are until the extend that everybody thought we are a couple. but i'm very sure he don have feelings for me. wat i can conclude is, every guy is different, so it still depends. since u 2 are working together, jus wait n see wat happen next. no rush and good luck

I definitely think he's hitting on you.  guys usually never do things WITHOUT a motive. I blieve for guys and gals.. if involves body language (touching,poking, hugging, or finding chances to!), i think the signal is pretty much clear... unless of course you're dealing with someone who flirts alot.