Merge branch 'zoom-in-play-button'
Merge branch 'master' of https://github.com/ubiqua/hogar