Merge pull request #1154 from Sti2nd/stable-1.1

Corrected name error in Cool Songs and added Popsip-Electric Dancer