Fix for overlay text wrapping
Fix for playlist page

Conflicts:
	MediaBrowser.WebDashboard/dashboard-ui/scripts/mediacontroller.js
Merge pull request #837 from timhobbs/upstream-master

Layout and playlist fixes