Add locales field and changed default_locale from ja to en.
Merge branch 'master' into gh-pages