Hip injury

Hi,
I had a niggling pain at the top of my hip bone about 6 weeks ago that became worse when running up hills. I then had a month off running due to a knee injury that has now healed nicely, however as soon as I started running again the pain returned. There is pain whilst running, going up and down stairs and on adduction of the hip. I have seen my GP who said she doesn't have a clue and to rest, however I am reluctant to do this as a month of rest has not solved the problem. I have had a sports massage which found and released some trigger points over the side of my hip, but this has done nothing to relieve the pain. Any ideas?