Finish Localization Key-Value
Merge remote-tracking branch 'origin/master'