Shoulder Problems!!! Help

Ive been training now for around 2 years seriously and around 6 months ago i had slight problems with my shoulders they used to hurt in the morning and i could hardly move them! then they came sort of better but there is still a hell of a sort of pop or something rubbing together when i do a circular motion with my right arm! and a click when i raise it straight up and extend out …i can feel this while dong pullups!

after doin biceps/triceps traing last monday night and doin some dips and pullups c/g i now have the same sort of thing in the left shoulder i can feel a grind when i rotate the arm!

any ideas please? its getting me down now! anyone else had similar problems? and what rehab /treatment can i do?

thanks

Go see a specialist about it.