Hard to say for sure, but it sounds like Upper Cross Syndrome brought on by poor posture, more so because its showing up in both shoulders now.

I responded to a thread a while ago detailing what I did to fix some pretty severe UCS. Not sure if it pertains to your situation, but it could be worth a read.

http://www.mobilitywod.com/community/#/discussion/1082/0

I don’t outline a program, but go over exercises and stretching that helped and how basically sitting slouched in front of a computer was the main cause. Its been about 1.5years since I got it and its completely cleared allowing me to do all types of upper body exercise with no discomfort what so ever.