Added Japanese as a selection in admin/views/menu.php
Merge branch 'release/2.11' into develop