Merge branch 'hotfix/20140710-naver.net'
たいこ
Merge branch 'hotfix/20140710-don' into develop