Merge branch 'hotfix/20140422-qq'
動画サイトいろいろ
Merge branch 'hotfix/20140423-movies' into develop