Merge branch 'hotfix/20140901-777nifty'
オタたま
Merge branch 'hotfix/20140901-otatama' into develop