Merge branch 'hotfix/20140610-storage'
はちま登録
Merge branch 'hotfix/20140610-esteru' into develop