Remove duplicate lines from merge
Merge Fix
CSS fix
Fix for subtitle language notification
Merge remote-tracking branch 'pistachitos/Pistachitos' into pistachitos-master