Merge branch 'release/20131224-1'
Merge branch 'release/20131225-1'
間違った変数を使っていたのを修正
Merge branch 'hotfix/api-error'
Merge branch 'master' into develop