Angry Shoulders-- Any advice?

Hi There, I was wondering if anyone had any advice about shoulder injuries and how to recover from them. A month ago, while attempting a standard invert, I pulled muscles in both shoulders during the dismount. One shoulder healed right away, the other is still soar, tight and with specific movements, there is actual pain. Nothing is broken, I can still lift things and have full range of motion, but I can't do any tricks on my right side without aggravating the injury. Has this ever happened to anyone before?? If so, what was your treatment plan and recovery time? Thx.