Quad/Tendon Pain...Any advice/ideas??

I have noticed that after a bout of intensive excercise i can feel a bump on the top of my knee cap
where it meets the quad - this bump hurts if i press down on it. Could this be an inflamed patellar
tendon?, it only hurts when i put pressure on the bump, although the knee does feel stiff and gives
me some clicking. A set of medium squats without proper warmup brought this on. Any
ideas/treatment advice would be appreciated.

cheers, Alex