Merge remote-tracking branch 'origin/master' into devel-beta
flagrate: update
録画済み番組の検索機能を追加
Merge remote-tracking branch 'origin/devel-beta'
Merge remote-tracking branch 'upstream/master'
20140517-1ppa1 release