Merge to live

*  Translations: Japan
*  Promises Article