Japanese lose menu upgrade;
Merge branch 'dev' of github.com:Chickenbottom/CSS385_PowerOverwhelming into dev