Merge branch 'hotfix/20140512-eagate'
eagateのtypo
Merge branch 'hotfix/20140513-eagatefix' into develop