Merge remote-tracking branch 'sehrgut/Grooveshark'