Merge branch 'hotfix/20140630-gamemaps'
式姫とdayz
Merge branch 'hotfix/20140630-shikihime' into develop