Suggest Remedy For Shoulder Pain With Cracks

Hi there. My right shoulder has gradually started crack and crunching more and more [when I roll it etc] over the past 18 months or so. My neck also cracks all the time now, when I lean my head to the left or right. Every morning when I get up, I crack my neck to the left and right, and it's pretty loud. Doesn't really hurt though, but sometimes in my shoulder it gets pretty uncomfortable and almost painful...