Merge branch 'hotfix/20140526-linestamp'
ラブライブ関係は許さない
Merge branch 'hotfix/20140526-lovelive' into develop