Merged JA localization with develop branch

Tested and merged JA localization with develop branch