New player panel
Fixing merges
New media player panel