Merge branch 'playback'
Added meta tags for iOS web app support
Merge branch 'master' into playback